Changeset 1461

Timestamp:

12/07/07 21:17:50 (9 months ago)

Author:

Shadowhand

Message:

Changes to Forge:

• Resurrected and fixed up Form_Hidden
  
• Changed Form_Hidden handling in Forge::call
  
• Updated /forge_demo with hidden and Form_Dateselect demos
  

Location:

trunk/modules/forge

Files:

• controllers/forge_demo.php (modified) (1 diff)
• i18n/en_US/forge.php (modified) (1 diff)
• libraries/Forge.php (modified) (3 diffs)
• libraries/Form_Hidden.php (copied) (copied from trunk/modules/forge/libraries/Form_Hidden.php) (1 diff)

trunk/modules/forge/controllers/forge_demo.php

@@ -19 +19 @@
         //   type($name)->attr(..)->attr(..);
         //
+        $form->hidden('hideme')->value('hiddenz!');
         $form->input('email')->label(TRUE)->rules('required|valid_email');
         $form->input('username')->label(TRUE)->rules('required|length[5,32]');

trunk/modules/forge/i18n/en_US/forge.php

@@ -3 +3 @@
 $lang = array
 (
+    'invalid_input' => 'Invalid input type requested: %s',
     'address_unit' => 'Unit #',
     'address_city' => 'City',

trunk/modules/forge/libraries/Forge.php

@@ -28 +28 @@
             return $this->inputs[$key];
         }
+        elseif (isset($this->hidden[$key]))
+        {
+            return $this->hidden[$key];
+        }
     }
 
     public function __call($method, $args)
     {
-        if ($method == 'hidden')
-        {
-            $this->hidden[$args[0]] = $args[1];
-            return;
-        }
         // Class name
         $input = 'Form_'.ucfirst($method);
 
         // Create the input
-        $input = new $input(empty($args) ? NULL : current($args));
+        switch(count($args))
+        {
+            case 1:
+                $input = new $input($args[0]);
+            break;
+            case 2:
+                $input = new $input($args[0], $args[1]);
+            break;
+        }
 
         if ( ! ($input instanceof Form_Input))
-            throw new Kohana_Exception('forge.invalid_input');
+            throw new Kohana_Exception('forge.invalid_input', get_class($input));
 
         if ($name = $input->name)
         {
-            // Assign by name
-            $this->inputs[$name] = $input;
+            if ($method == 'hidden')
+            {
+                $this->hidden[$name] = $input;
+            }
+            else
+            {
+                // Assign by name
+                $this->inputs[$name] = $input;
+            }
         }
         else
@@ -79 +93 @@
 
         $data = array();
-        foreach($this->inputs as $input)
+        foreach(array_merge($this->hidden, $this->inputs) as $input)
         {
             if ($name = $input->name)
@@ -95 +109 @@
         $form = new View($template, $this->template);
 
+        $hidden = array();
+        if ( ! empty($this->hidden))
+        {
+            foreach($this->hidden as $input)
+            {
+                $hidden[$input->name] = $input->value;
+            }
+        }
+
         // Set the form open and close
-        $form->open  = form::open($form->action, array('method' => 'post'), $this->hidden);
+        $form->open  = form::open($form->action, array('method' => 'post'), $hidden);
         $form->close = form::close();
 

trunk/modules/forge/libraries/Form_Hidden.php

@@ -9 +9 @@
     );
 
-    protected $protect = array('type');
+    protected $protect = array('type', 'label');
 
-    protected function html_element()
+    public function html()
     {
         $data = $this->data;
-
-        unset($data['label']);
 
         return form::hidden($data);