Changeset 9583

Timestamp:

Dec 18, 2008, 1:57:53 AM (14 years ago)

Author:

ebihara

Message:

#3215:added support to template customizing for using component

Location:

OpenPNE3/trunk

Files:

• lib/config/sfOpenPNEViewConfigHandler.class.php (modified) (1 diff)
• lib/helper/PartsHelper.php (modified) (2 diffs)
• lib/view/sfOpenPNEView.class.php (modified) (3 diffs)
• test/unit/config/sfOpenPNEViewConfigHandlerTest.php (modified) (1 diff)

OpenPNE3/trunk/lib/config/sfOpenPNEViewConfigHandler.class.php

@@ -91 +91 @@
       $target .= ')';
 
-      $data .= "  \$this->setCustomize('$name', '{$template[0]}', '{$template[1]}', $category, $parts, $target);\n";
+      $isComponent = 'false';
+      if (!empty($customize['is_component']))
+      {
+        $isComponent = 'true';
+      }
+
+      $data .= "  \$this->setCustomize('$name', '{$template[0]}', '{$template[1]}', $category, $parts, $target, $isComponent);\n";
       $data .= "  if (sfConfig::get('sf_logging_enabled')) \$this->context->getEventDispatcher()->notify(new sfEvent(\$this, 'application.log', array(sprintf('Set customize \"%s\" (%s/%s)', '$name', '{$template[0]}', '{$template[1]}'))));\n";
     }

OpenPNE3/trunk/lib/helper/PartsHelper.php

@@ -100 +100 @@
   $lastActionStack = $context->getActionStack()->getLastEntry();
 
-
   $content = '';
   foreach ($customizes as $customize) {
@@ -107 +106 @@
       $moduleName = $lastActionStack->getModuleName();
     }
-    $actionName = '_'.$customize[1];
-    $view = new sfPartialView($context, $moduleName, $actionName, '');
-    $view->setPartialVars($lastActionStack->getActionInstance()->getVarHolder()->getAll());
-    if (_is_disabled_plugin_dir($view->getDirectory())) {
-      continue;
+    $actionName = $customize[1];
+    $vars = $lastActionStack->getActionInstance()->getVarHolder()->getAll();
+
+    if ($customize[2])
+    {
+      $content .= get_component($moduleName, $actionName, $vars);
     }
-    $content .= $view->render();
+    else
+    {
+      $templateName = $moduleName.'/'.$actionName;
+      $content .= get_partial($templateName, $vars);
+    }
   }
 

OpenPNE3/trunk/lib/view/sfOpenPNEView.class.php

@@ -25 +25 @@
   public $customizeTemplates = array();
 
+  protected $customizeComponents = array();
+
   /**
    * Sets the customize.
@@ -34 +36 @@
    * @param array  $partsNames     Parts names
    * @param array  $targetNames    Target names
+   * @param bool   $isComponent
    */
-  public function setCustomize($attributeName, $moduleName, $templateName, $categoryNames, $partsNames, $targetNames)
+  public function setCustomize($attributeName, $moduleName, $templateName, $categoryNames, $partsNames, $targetNames, $isComponent = false)
   {
     if (empty($categoryNames))
@@ -73 +76 @@
     }
 
-    $this->customizeTemplates[$attributeName] = array($moduleName, $templateName);
+    $this->customizeTemplates[$attributeName] = array($moduleName, $templateName, $isComponent);
   }
 

OpenPNE3/trunk/test/unit/config/sfOpenPNEViewConfigHandlerTest.php

@@ -35 +35 @@
 
 $content = <<<EOF
-  \$this->setCustomize('first', '', 'first', array(), array(), array());  if (sfConfig::get('sf_logging_enabled')) \$this->context->getEventDispatcher()->notify(new sfEvent(\$this, 'application.log', array(sprintf('Set customize "%s" (%s/%s)', 'first', '', 'first'))));
+  \$this->setCustomize('first', '', 'first', array(), array(), array(), false);  if (sfConfig::get('sf_logging_enabled')) \$this->context->getEventDispatcher()->notify(new sfEvent(\$this, 'application.log', array(sprintf('Set customize "%s" (%s/%s)', 'first', '', 'first'))));
 EOF;
 $t->is(strip_cl($h->addCustomizes('myView')), strip_cl($content), 'addCustomizes() basic customize addition');