Changeset 5992

Timestamp:

02/02/12 19:39:34 (4 months ago)

Author:

vain

Message:

• modified display() method to use the view/template mapping

Location:

trunk/core

Files:

• modulecontroller.core.php (modified) (6 diffs)
• renderer/templatemapper.php (modified) (3 diffs)

trunk/core/modulecontroller.core.php

@@ -93 +93 @@
 
     /**
-     * Returns the Doctrine Entity Manager 
+     * Returns the Doctrine Entity Manager
      *
      * @return \Doctrine\ORM\EntityManager
@@ -200 +200 @@
 
            $repos = $module_models_path . 'repositories' . DS . ucfirst($modulename) . 'Repository.php';
-           
+
            if(is_file($repos) === true and class_exists('Entities\\' . ucfirst($modulename), false) === false)
            {
@@ -372 +372 @@
 
     /**
-     * Set the template name
-     *
-     * @param string $template Name of the Template with full Path
-     */
-    public function setTemplate($template)
-    {
-        #self::checkTemplateExtension($template);
-        $this->template = $template;
-    }
-
-    /**
      * Sets the Render Mode
      *
@@ -422 +411 @@
     public function display($templates = null)
     {
+        include ROOT_CORE . 'renderer/templatemapper.php';
+        $view_mapper = new Clansuite_View_Mapper;
+
         # set layout and content template by parameter array
         if(is_array($templates) === true)
@@ -427 +419 @@
             if(isset($templates['layout_template']) === true)
             {
-                $this->setLayoutTemplate($templates['layout_template']);
+                $view_mapper->setLayoutTemplate($templates['layout_template']);
             }
 
             if(isset($templates['content_template']) === true)
             {
-                $this->setTemplate($templates['content_template']);
+                $view_mapper->setTemplate($templates['content_template']);
             }
         }
 
         # only the content template is set
-        if(is_string($templates)) { $this->setTemplate($templates); }
+        if(is_string($templates)) { $view_mapper->setTemplate($templates); }
 
         # get the templatename
-        $templatename = $this->getTemplateName();
+        $templatename = $view_mapper->getTemplateName();
 
         # get the view
@@ -521 +513 @@
             $route = Clansuite_HttpRequest::getRoute();
 
-            # we use internal rewrite style here: /module/action            
+            # we use internal rewrite style here: /module/action
             $redirect_to = '/' . $route->getModuleName();
             $submodule = $route->getSubModuleName();

trunk/core/renderer/templatemapper.php

@@ -43 +43 @@
  * Clansuite_View_Mapper is a "class action" to "template" mapper.
  * This has nothing to do with rendering, but with template selection for the view.
- * If no template was set manually in the action of a module (class), 
- * this class will help determining the template, 
+ * If no template was set manually in the action of a module (class),
+ * this class will help determining the template,
  * by mapping the requested class and action to a template.
  */
 class Clansuite_View_Mapper
 {
+    /**
+     * Template name.
+     *
+     * @var string
+     */
+    public $template;
+
     /**
      * Ensures the template extension is correct.
@@ -82 +89 @@
             # construct template name
             $template = Clansuite_TargetRoute::getActionName() . '.tpl';
-             
+
             $this->setTemplate($template);
         }
@@ -88 +95 @@
         return $this->template;
     }
+
+    /**
+     * Set the template name
+     *
+     * @param string $template Name of the Template with full Path
+     */
+    public function setTemplate($template)
+    {
+        #self::checkTemplateExtension($template);
+        $this->template = (string) $template;
+    }
 }
 ?>