Permalink
Browse files

Merge pull request #9616 from exviva/multiple_select_name_double_squa…

…re_brackets

Fix incorrectly appended square brackets to a multiple select box

Before:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][][]" ...>

After:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][]" ...>
  • Loading branch information...
2 parents 01c8918 + 8e05a6f commit 3a210da65f7718721f86397d64e43beb534121ef @carlosantoniodasilva carlosantoniodasilva committed Mar 9, 2013
View
@@ -1,5 +1,20 @@
## Rails 4.0.0 (unreleased) ##
+* Fix incorrectly appended square brackets to a multiple select box
+ if an explicit name has been given and it already ends with "[]"
+
+ Before:
+
+ select(:category, [], {}, multiple: true, name: "post[category][]")
+ # => <select name="post[category][][]" ...>
+
+ After:
+
+ select(:category, [], {}, multiple: true, name: "post[category][]")
+ # => <select name="post[category][]" ...>
+
+ *Olek Janiszewski*
+
* Fixed regression when using `assert_template` to verify files sent using
`render file: 'README.md'`.
Fixes #9464.
@@ -84,7 +84,7 @@ def add_default_name_and_id(options)
options["id"] = options.fetch("id"){ tag_id }
end
- options["name"] += "[]" if options["multiple"]
+ options["name"] += "[]" if options["multiple"] && !options["name"].ends_with?("[]")
options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence
end
@@ -575,6 +575,14 @@ def test_select_with_multiple_and_without_hidden_input
)
end
+ def test_select_with_multiple_and_with_explicit_name_ending_with_brackets
+ output_buffer = select(:post, :category, [], {include_hidden: false}, multiple: true, name: 'post[category][]')
+ assert_dom_equal(
+ "<select multiple=\"multiple\" id=\"post_category\" name=\"post[category][]\"></select>",
+ output_buffer
+ )
+ end
+
def test_select_with_multiple_and_disabled_to_add_disabled_hidden_input
output_buffer = select(:post, :category, "", {}, :multiple => true, :disabled => true)
assert_dom_equal(

0 comments on commit 3a210da

Please sign in to comment.