kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Allow proc for value/text method in collection_select

Browse source 
And options_from_collection_for_select as well.

[Carlos Antonio da Silva + Rafael Mendonça França]
This commit is contained in:
Carlos Antonio da Silva 2012-02-01 17:43:44 -02:00
parent b161956061
commit 9035324367
3 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionpack/lib/action_view/helpers/form_options_helper.rb
View file

@ -360,7 +360,7 @@ module ActionView
# should produce the desired results.
def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
options = collection.map do |element|
[element.send(text_method), element.send(value_method)]
[value_for_collection(element, text_method), value_for_collection(element, value_method)]
end
selected, disabled = extract_selected_and_disabled(selected)
select_deselect = {
@ -637,6 +637,10 @@ module ActionView
selected
end
end
def value_for_collection(item, value)
value.respond_to?(:call) ? value.call(item) : item.send(value)
end
end
class FormBuilder

4
actionpack/lib/action_view/helpers/tags/collection_helpers.rb
View file

@ -72,10 +72,6 @@ module ActionView
yield value, text, default_html_options
end.join.html_safe
end
def value_for_collection(item, value) #:nodoc:
value.respond_to?(:call) ? value.call(item) : item.send(value)
end
end
end
end

32
actionpack/test/template/form_options_helper_test.rb
View file

@ -87,6 +87,20 @@ class FormOptionsHelperTest < ActionView::TestCase
)
end
def test_collection_options_with_proc_for_value_method
assert_dom_equal(
"<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
options_from_collection_for_select(dummy_posts, lambda { |p| p.author_name }, "title")
)
end
def test_collection_options_with_proc_for_text_method
assert_dom_equal(
"<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
options_from_collection_for_select(dummy_posts, "author_name", lambda { |p| p.title })
)
end
def test_string_options_for_select
options = "<option value=\"Denmark\">Denmark</option><option value=\"USA\">USA</option><option value=\"Sweden\">Sweden</option>"
assert_dom_equal(
@ -793,6 +807,24 @@ class FormOptionsHelperTest < ActionView::TestCase
)
end
def test_collection_select_with_proc_for_value_method
@post = Post.new
assert_dom_equal(
"<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option></select>",
collection_select("post", "author_name", dummy_posts, lambda { |p| p.author_name }, "title")
)
end
def test_collection_select_with_proc_for_text_method
@post = Post.new
assert_dom_equal(
"<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option></select>",
collection_select("post", "author_name", dummy_posts, "author_name", lambda { |p| p.title })
)
end
def test_time_zone_select
@firm = Firm.new("D")
html = time_zone_select( "firm", "time_zone" )