Changeset 7726

Timestamp:

03/03/08 15:16:01 (7 months ago)

Author:

fabien

Message:

moved partial and component cache management to sfPartialView

Files:

• branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/PartialHelper.php (modified) (3 diffs)
• branches/1.1/lib/view/sfPartialView.class.php (modified) (4 diffs)

branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/PartialHelper.php

@@ -110 +110 @@
-  $actionName = '_'.$componentName;
-
-  // check cache
-  if ($cacheManager = $context->getViewCacheManager())
-  {
-    $cacheManager->registerConfiguration($moduleName);
-    if ($retval = $cacheManager->getPartialCache($moduleName, $actionName, $cacheManager->computeCacheKey($vars)))
-    {
-      return $retval;
-    }
-    else
-    {
-      $mainResponse = $context->getResponse();
-      $responseClass = get_class($mainResponse);
-      $context->setResponse($response = new $responseClass($context->getEventDispatcher(), $mainResponse->getOptions()));
-    }
-  }
-
-  $allVars = _call_component($moduleName, $componentName, $vars);
-
@@ -132 +116 @@
-    // render
-    $view = new sfPartialView($context, $moduleName, $actionName, '');
+    $view->setPartialVars($vars);
-    $view->getAttributeHolder()->add($allVars);
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-}
@@ -202 +177 @@
-  $actionName = '_'.$templateName;
-
-  if ($cacheManager = $context->getViewCacheManager())
-  {
-    $cacheManager->registerConfiguration($moduleName);
-
-    $cacheKey = $cacheManager->computeCacheKey($vars);
-    if ($retval = $cacheManager->getPartialCache($moduleName, $actionName, $cacheKey))
-    {
-      return $retval;
-    }
-    else
-    {
-      $mainResponse = $context->getResponse();
-      $responseClass = get_class($mainResponse);
-      $context->setResponse($response = new $responseClass($context->getEventDispatcher(), $mainResponse->getOptions()));
-    }
-  }
-
-  $view = new sfPartialView($context, $moduleName, $actionName, '');
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-

branches/1.1/lib/view/sfPartialView.class.php

@@ -19 +19 @@
-class sfPartialView extends sfPHPView
-{
+  protected
+    $partialVars = array();
+
-  /**
-   * Executes any presentation logic for this view.
@@ -24 +27 @@
-  public function execute()
-  {
+  }
+
+  public function setPartialVars(array $partialVars)
+  {
+    $this->partialVars = $partialVars;
-  }
-
@@ -56 +64 @@
-    }
-
+    if ($cacheManager = $this->context->getViewCacheManager())
+    {
+      $cacheManager->registerConfiguration($this->moduleName);
+
+      $cacheKey = $cacheManager->computeCacheKey($this->partialVars);
+      if ($retval = $cacheManager->getPartialCache($this->moduleName, $this->actionName, $cacheKey))
+      {
+        return $retval;
+      }
+      else
+      {
+        $mainResponse = $this->context->getResponse();
+        $responseClass = get_class($mainResponse);
+        $this->context->setResponse($response = new $responseClass($this->context->getEventDispatcher(), $mainResponse->getOptions()));
+      }
+    }
+
+    $this->getAttributeHolder()->add($this->partialVars);
+
-    // execute pre-render check
-    $this->preRenderCheck();
@@ -61 +88 @@
-    // render template
-    $retval = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());
+
+    if ($cacheManager)
+    {
+      $retval = $cacheManager->setPartialCache($this->moduleName, $this->actionName, $cacheKey, $retval);
+      $this->context->setResponse($mainResponse);
+      $mainResponse->merge($response);
+    }
-
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))