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

Merge pull request #4802 from carlosantoniodasilva/collection-helpers-refactor

Browse source 
Refactor select helper and remove eval
This commit is contained in:
José Valim 2012-01-31 08:59:48 -08:00
commit 40c287c798
3 changed files with 28 additions and 14 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

@ -334,7 +334,7 @@ module ActionView
end.join("\n").html_safe
end
# Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning
# Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning
# the result of a call to the +value_method+ as the option value and the +text_method+ as the option text.
# Example:
# options_from_collection_for_select(@people, 'id', 'name')
@ -418,9 +418,9 @@ module ActionView
# wrap the output in an appropriate <tt><select></tt> tag.
def option_groups_from_collection_for_select(collection, group_method, group_label_method, option_key_method, option_value_method, selected_key = nil)
collection.map do |group|
group_label_string = eval("group.#{group_label_method}")
group_label_string = group.send(group_label_method)
"<optgroup label=\"#{ERB::Util.html_escape(group_label_string)}\">" +
options_from_collection_for_select(eval("group.#{group_method}"), option_key_method, option_value_method, selected_key) +
options_from_collection_for_select(group.send(group_method), option_key_method, option_value_method, selected_key) +
'</optgroup>'
end.join.html_safe
end

9
actionpack/lib/action_view/helpers/tags/collection_select.rb
View file

@ -12,9 +12,14 @@ module ActionView
end
def render
selected_value = @options.has_key?(:selected) ? @options[:selected] : value(@object)
option_tags_options = {
:selected => @options.fetch(:selected) { value(@object) },
:disabled => @options[:disabled]
}
select_content_tag(
options_from_collection_for_select(@collection, @value_method, @text_method, :selected => selected_value, :disabled => @options[:disabled]), @options, @html_options
options_from_collection_for_select(@collection, @value_method, @text_method, option_tags_options),
@options, @html_options
)
end
end

27
actionpack/lib/action_view/helpers/tags/select.rb
View file

@ -11,21 +11,30 @@ module ActionView
end
def render
selected_value = @options.has_key?(:selected) ? @options[:selected] : value(@object)
option_tags_options = {
:selected => @options.fetch(:selected) { value(@object) },
:disabled => @options[:disabled]
}
# Grouped choices look like this:
#
# [nil, []]
# { nil => [] }
#
if !@choices.empty? && @choices.first.respond_to?(:last) && Array === @choices.first.last
option_tags = grouped_options_for_select(@choices, :selected => selected_value, :disabled => @options[:disabled])
option_tags = if grouped_choices?
grouped_options_for_select(@choices, option_tags_options)
else
option_tags = options_for_select(@choices, :selected => selected_value, :disabled => @options[:disabled])
options_for_select(@choices, option_tags_options)
end
select_content_tag(option_tags, @options, @html_options)
end
private
# Grouped choices look like this:
#
# [nil, []]
# { nil => [] }
#
def grouped_choices?
!@choices.empty? && @choices.first.respond_to?(:last) && Array === @choices.first.last
end
end
end
end