Changeset 1915

Timestamp:

02/04/2008 07:00:18 PM (10 months ago)

Author:

PugFish

Message:

Added ability to use custom forms in Forge, rather than using a template which iterates over each input there is a variable for each input allowing more customisable forms.
Fixed valid_ rules not finding the i18n string.

Location:

trunk/modules/forge

Files:

• controllers/forge_demo.php (modified) (1 diff)
• libraries/Forge.php (modified) (2 diffs)
• libraries/Form_Input.php (modified) (1 diff)

trunk/modules/forge/controllers/forge_demo.php

@@ -38 +38 @@
 
                 echo $form->html();
+
+                // Using a custom template:
+                // echo $form->html('custom_view', TRUE);
+                // Inside the view access the inputs using $input_id->html(), ->label() etc
+                //
+                // To get the errors use $input_id_errors.
+                // Set the error format with $form->error_format('<div>{message}</div>');
+                // Defaults to <p class="error">{message}</p>
+                //
+                // Examples:
+                //   echo $username->html(); echo $password_errors;
         }
 

trunk/modules/forge/libraries/Forge.php

@@ -19 +19 @@
         public $hidden = array();
 
+        // Error message format, only used with custom templates
+        public $error_format = '<p class="error">{message}</p>';
+        public $newline_char = "\n";
+
         public function __construct($action = '', $title = '', $method = NULL, $attr = array())
         {
@@ -120 +124 @@
         }
 
+        public function error_format($string = '')
+        {
+                if (strpos((string) $string, '{message}') === FALSE)
+                        throw new Kohana_Exception('validation.error_format');
+
+                $this->error_format = $string;
+        }
+
         /**
          * Creates the form HTML
          *
          * @param   string   form view template name
+         * @param   boolean  use a custom view
          * @return  string
          */
-        public function html($template = 'forge_template')
+        public function html($template = 'forge_template', $custom = FALSE)
         {
                 // Load template with current template vars
                 $form = new View($template, $this->template);
 
-                $hidden = array();
-                if ( ! empty($this->hidden))
-                {
-                        foreach($this->hidden as $input)
-                        {
-                                $hidden[$input->name] = $input->value;
-                        }
-                }
-
-                $form_type = 'open';
-                // See if we need a multipart form
-                foreach ($this->inputs as $input)
-                {
-                        if ($input instanceof Form_Upload)
-                        {
-                                $form_type = 'open_multipart';
-                                break;
-                        }
-                }
-
-                // Set the form open and close
-                $form->open  = form::$form_type(arr::remove('action', $this->attr), $this->attr, $hidden);
-                $form->close = form::close();
-
-                // Set the inputs
-                $form->inputs = $this->inputs;
-
-                return $form->render();
+                if ($custom)
+                {
+                        // Using a custom view
+
+                        $data = array();
+                        foreach ($this->inputs as $input)
+                        {
+                                $data[$input->name] = $input;
+
+                                // Compile the error messages for this input
+                                $messages = '';
+                                $errors = $input->error_messages();
+                                if (is_array($errors) AND ! empty($errors))
+                                {
+                                        foreach($errors as $error)
+                                        {
+                                                // Replace the message with the error in the html error string
+                                                $messages .= str_replace('{message}', $error, $this->error_format).$this->newline_char;
+                                        }
+                                }
+
+                                $data[$input->name.'_errors'] = $messages;
+                        }
+
+                        $form->set($data);
+                }
+                else
+                {
+                        // Using a template view
+
+                        $hidden = array();
+                        if ( ! empty($this->hidden))
+                        {
+                                foreach($this->hidden as $input)
+                                {
+                                        $hidden[$input->name] = $input->value;
+                                }
+                        }
+
+                        $form_type = 'open';
+                        // See if we need a multipart form
+                        foreach ($this->inputs as $input)
+                        {
+                                if ($input instanceof Form_Upload)
+                                {
+                                        $form_type = 'open_multipart';
+                                }
+                        }
+
+                        // Set the form open and close
+                        $form->open  = form::$form_type(arr::remove('action', $this->attr), $this->attr, $hidden);
+                        $form->close = form::close();
+
+                        // Set the inputs
+                        $form->inputs = $this->inputs;
+                }
+
+                return $form;
         }
 

trunk/modules/forge/libraries/Form_Input.php

@@ -248 +248 @@
                                 else
                                 {
+                                        // Strip 'valid_' from func name
+                                        $func = (substr($func, 0, 6) === 'valid_') ? substr($func, 6) : $func;
                                         // Fetch an i18n error message
                                         $error = Kohana::lang('validation.'.$func, $args);