Changeset 1154:e85c1417b8a4 for inc/admin/class.dc.form.php

Timestamp:

04/09/13 09:08:48 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Message:

Intermediate commit, needs to be better documented

• introducing new dcListFetcher class for lists
• Lists are now driving filters
• forms tags are now defined in twig format

File:

• inc/admin/class.dc.form.php (modified) (5 diffs)

inc/admin/class.dc.form.php

@@ -20 +20 @@
 class dcFormNode extends Twig_Node
 {
-     public function __construct($name,Twig_NodeInterface $body,$lineno,$tag=null)
-     {
-          parent::__construct(array('body' => $body),array('name' => $name),$lineno,$tag);
+     public function __construct($name,Twig_NodeInterface $body,$attr,$lineno,$tag=null)
+     {
+          parent::__construct(array('body' => $body),array('name' => $name, 'attr' => $attr),$lineno,$tag);
      }
      
@@ -36 +36 @@
           $compiler
                ->write("\$context['dc_form']->beginForm(")
-               ->subcompile($this->getAttribute('name'))
+               ->subcompile($this->getAttribute('name'));
+          if ($this->getAttribute('attr') !== null) {
+               $compiler
+                    ->write(',')
+                    ->subcompile($this->getAttribute('attr'));
+          }
+          $compiler
                ->write(");\n");
           $compiler
@@ -56 +62 @@
           $stream = $this->parser->getStream();
           $name = $this->parser->getExpressionParser()->parseExpression();
+          $attr = null;
+          if ($stream->test(Twig_Token::NAME_TYPE, 'with')) {
+               $stream->next();
+               $attr = $this->parser->getExpressionParser()->parseExpression();
+          }
           $stream->expect(Twig_Token::BLOCK_END_TYPE);
           $body = $this->parser->subparse(array($this,'decideBlockEnd'),true);
           $stream->expect(Twig_Token::BLOCK_END_TYPE);
           
-          return new dcFormNode($name,$body,$token->getLine(),$this->getTag());
+          return new dcFormNode($name,$body,$attr,$token->getLine(),$this->getTag());
      }
      
@@ -219 +230 @@
      }
 
-     public function beginForm($name)
+     public function beginForm($name,$attr=array())
      {
           if (isset($this->forms[$name])) {
                $this->currentForm = $this->forms[$name];
-               $this->currentForm->begin();
+               $this->currentForm->begin($attr);
           }
           else {
@@ -381 +392 @@
           }
      }
-     public function begin()
-     {
-          echo sprintf(
-               '<form%s method="%s" action="%s">',
-               empty($this->id) ? '' : ' id="'.$this->id.'"',
-               $this->method,
-               $this->action
-          );
+     public function begin($attr=array())
+     {
+          $attr['method'] = $this->method;
+          $attr['action'] = $this->action;
+          if (!empty($this->id)) {
+               $attr['id'] = $this->id;
+          }
+          $this->core->tpl->getExtension('dc_form')->renderWidget(
+               'beginform',
+               $attr);
      }