Changeset 243 for trunk/trax/vendor/trax

Timestamp:

08/22/06 23:25:24 (6 years ago)

Author:

john

Message:

fixed select multiple to add brackets

Location:

trunk/trax/vendor/trax/action_view/helpers

Files:

• form_helper.php (modified) (2 diffs)
• form_options_helper.php (modified) (4 diffs)

trunk/trax/vendor/trax/action_view/helpers/form_helper.php

@@ -130 +130 @@
      *  @uses tag_name_with_index()
      */
-    function add_default_name_and_id($options) {    
+    function add_default_name_and_id($options) {  
+        $name_option_exists = array_key_exists('name', $options);   
         if(array_key_exists("index", $options)) {
-            $options["name"] = array_key_exists("name", $options)
-                ? $options["name"]
-                : $this->tag_name_with_index($options["index"]);
-            $options["id"] = array_key_exists("id", $options)
-                ? $options["id"]
-                : $this->tag_id_with_index($options["index"]);
-            unset($options["index"]);
+            $options['name'] = $name_option_exists
+                ? $options['name']
+                : $this->tag_name_with_index($options['index']);
+            $options['id'] = array_key_exists('id', $options)
+                ? $options['id']
+                : $this->tag_id_with_index($options['index']);
+            unset($options['index']);
         } elseif($this->auto_index) {
-            $options["name"] = array_key_exists("name", $options)
-                ? $options["name"]
+            $options['name'] = $name_option_exists
+                ? $options['name']
                 : $this->tag_name_with_index($this->auto_index);
-            $options["id"] = array_key_exists("id", $options)
-                ? $options["id"]
+            $options['id'] = array_key_exists('id', $options)
+                ? $options['id']
                 : $this->tag_id_with_index($this->auto_index);
         } else {
-            $options["name"] = array_key_exists("name", $options)
-                ? $options["name"]
+            $options['name'] = $name_option_exists
+                ? $options['name']
                 : $this->tag_name();
-            $options["id"] = array_key_exists("id", $options)
-                ? $options["id"]
+            $options['id'] = array_key_exists('id', $options)
+                ? $options['id']
                 : $this->tag_id();
+        }
+        if(array_key_exists('multiple', $options) && !$name_option_exists) {
+            $options['name'] .= "[]";           
         }
         return $options;
@@ -232 +236 @@
         return $this->error_wrapping(
            $this->content_tag("textarea",
-                              htmlspecialchars($this->value()),
+                              htmlspecialchars($this->value(), ENT_COMPAT),
                               $options),
            array_key_exists($this->attribute_name,$this->object()->errors)

trunk/trax/vendor/trax/action_view/helpers/form_options_helper.php

@@ -208 +208 @@
                  $this->add_options(
                            $this->options_for_select($choices, $value),
-                           $options,
-                           $value),
+                           $options),
                  $html_options),
              $this->object()->errors[$this->attribute_name]);
@@ -237 +236 @@
                         $attribute_text,
                         $value),
-                    $options,
-                    $value),
+                    $options),
                 $html_options),
             $this->object()->errors[$this->attribute_name]);
@@ -261 +259 @@
                         $this->country_options_for_select($value,
                                                           $priority_countries),
-                        $options,
-                        $value),
+                        $options),
                 $html_options),
             $this->object()->errors[$this->attribute_name]);
@@ -271 +268 @@
      *
      *  @param string
-     *  @param string[]
-     *  @param string
-     *  @uses value()
-     */
-    private function add_options($option_tags, $options, $value = null) {
+     *  @param array
+     */
+    private function add_options($option_tags, $options) {
         if(array_key_exists("include_blank", $options)
            && $options["include_blank"] == true) {
             $option_tags = "<option value=\"\"></option>\n" . $option_tags;
         } 
-        if(empty($value) && array_key_exists('prompt', $options)) {
+        if(array_key_exists('prompt', $options)) {
             $text = $options['prompt'] ? $options['prompt'] : "Please select";
             return ("<option value=\"\">$text</option>\n" . $option_tags);