[limb-svn] r5881 - in 3.x/trunk/limb/web_app/src/template/tags: fetch request

[svn at limb-project.com]

Author: serega
Date: 2007-05-14 01:20:48 +0400 (Mon, 14 May 2007)
New Revision: 5881
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5881

Modified:
   3.x/trunk/limb/web_app/src/template/tags/fetch/active_record_fetch.tag.php
   3.x/trunk/limb/web_app/src/template/tags/fetch/find_parameters.tag.php
   3.x/trunk/limb/web_app/src/template/tags/request/route_url.tag.php
   3.x/trunk/limb/web_app/src/template/tags/request/route_url_set.tag.php
Log:
-- fixed tests for WEB_APP package due to recent WACT refactorings

Modified: 3.x/trunk/limb/web_app/src/template/tags/fetch/active_record_fetch.tag.php
===================================================================
--- 3.x/trunk/limb/web_app/src/template/tags/fetch/active_record_fetch.tag.php	2007-05-13 12:04:03 UTC (rev 5880)
+++ 3.x/trunk/limb/web_app/src/template/tags/fetch/active_record_fetch.tag.php	2007-05-13 21:20:48 UTC (rev 5881)
@@ -33,9 +33,9 @@
     return parent :: preParse();
   }
 
-  function preGenerate($code)
+  function generateBeforeContent($code)
   {
-    parent :: preGenerate($code);
+    parent :: generateBeforeContent($code);
 
     $code->writePhp($this->getComponentRefCode() .
                       '->setAdditionalParam("class_path", "' . $this->getAttribute('class_path') . '");');

Modified: 3.x/trunk/limb/web_app/src/template/tags/fetch/find_parameters.tag.php
===================================================================
--- 3.x/trunk/limb/web_app/src/template/tags/fetch/find_parameters.tag.php	2007-05-13 12:04:03 UTC (rev 5880)
+++ 3.x/trunk/limb/web_app/src/template/tags/fetch/find_parameters.tag.php	2007-05-13 21:20:48 UTC (rev 5881)
@@ -16,7 +16,7 @@
 */
 class lmbFindParametersTag extends WactCompilerTag
 {
-  function generateContents($code)
+  function generateTagContent($code)
   {
     foreach(array_keys($this->attributeNodes) as $key)
     {

Modified: 3.x/trunk/limb/web_app/src/template/tags/request/route_url.tag.php
===================================================================
--- 3.x/trunk/limb/web_app/src/template/tags/request/route_url.tag.php	2007-05-13 12:04:03 UTC (rev 5880)
+++ 3.x/trunk/limb/web_app/src/template/tags/request/route_url.tag.php	2007-05-13 21:20:48 UTC (rev 5881)
@@ -15,14 +15,12 @@
 */
 class lmbRouteURLTag extends WactRuntimeComponentHTMLTag
 {
-  //protected $runtimeComponentName = 'WactRuntimeTagComponent';
-
   function getRenderedTag()
   {
     return 'a';
   }
 
-  function preGenerate($code)
+  function generateBeforeOpenTag($code)
   {
     $href = '$' . $code->getTempVariable();
 
@@ -34,23 +32,19 @@
     $params = '$' . $code->getTempVariable();
     $code->writePhp($params . ' = array();');
 
-    
-    
     if(isset($this->attributeNodes['params']))
     {
-      $this->attributeNodes['params']->generatePreStatement($code);
       $code->writePhp($params . ' = lmbArrayHelper :: explode(",", ":",');
       $this->attributeNodes['params']->generateExpression($code);
       $code->writePhp(');');
-      $this->attributeNodes['params']->generatePostStatement($code);
     }
 
     if($this->getBoolAttribute('skip_controller')) $skip_controller = 'true';
     else $skip_controller = 'false';
-    
+
     $this->removeAttribute('skip_controller');
     $code->writePhp($href . '= lmbToolkit :: instance()->getRoutesUrl(' . $params . ', ' . $route .', ' . $skip_controller .');');
-   
+
     $this->removeAttribute('route');
     $this->removeAttribute('params');
 
@@ -59,11 +53,9 @@
       $params = '$' . $code->getTempVariable();
       $code->writePhp($params . ' = array();');
 
-      $this->attributeNodes['extra']->generatePreStatement($code);
       $code->writePhp($href . ' .= ');
       $this->attributeNodes['extra']->generateExpression($code);
       $code->writePhp(';');
-      $this->attributeNodes['extra']->generatePostStatement($code);
 
       $this->removeAttribute('extra');
     }
@@ -71,7 +63,7 @@
     $code->writePhp($this->getComponentRefCode() .
                     '->setAttribute("href", ' . $href . ');');
 
-    parent :: preGenerate($code);
+    parent :: generateBeforeOpenTag($code);
   }
 }
 

Modified: 3.x/trunk/limb/web_app/src/template/tags/request/route_url_set.tag.php
===================================================================
--- 3.x/trunk/limb/web_app/src/template/tags/request/route_url_set.tag.php	2007-05-13 12:04:03 UTC (rev 5880)
+++ 3.x/trunk/limb/web_app/src/template/tags/request/route_url_set.tag.php	2007-05-13 21:20:48 UTC (rev 5881)
@@ -16,7 +16,7 @@
 */
 class lmbRouteUrlSetTag extends WactCompilerTag
 {
-  function generateContents($code)
+  function generateTagContent($code)
   {
     $route = '$' . $code->getTempVariable();
     $code->writePhp($route. ' = "";');
@@ -28,11 +28,9 @@
 
     if(isset($this->attributeNodes['params']))
     {
-      $this->attributeNodes['params']->generatePreStatement($code);
       $code->writePhp($params . ' = lmbArrayHelper :: explode(",",":",');
       $this->attributeNodes['params']->generateExpression($code);
       $code->writePhp(');');
-      $this->attributeNodes['params']->generatePostStatement($code);
     }
 
     $skip_controller = '$' . $code->getTempVariable();