Fix indentation and update changelogs for previous commit
This commit is contained in:
parent
d0092dc44d
commit
4cf93935b2
@ -1,5 +1,7 @@
|
||||
*Edge*
|
||||
|
||||
* time_zone_select: support for regexp matching of priority zones. Resolves #195 [Ernie Miller]
|
||||
|
||||
* Made ActionView::Base#render_file private [Josh Peek]
|
||||
|
||||
* Fix polymorphic_url with singleton resources. #461 [Tammer Saleh]
|
||||
|
@ -315,9 +315,9 @@ def time_zone_options_for_select(selected = nil, priority_zones = nil, model = :
|
||||
convert_zones = lambda { |list| list.map { |z| [ z.to_s, z.name ] } }
|
||||
|
||||
if priority_zones
|
||||
if priority_zones.is_a?(Regexp)
|
||||
if priority_zones.is_a?(Regexp)
|
||||
priority_zones = model.all.find_all {|z| z =~ priority_zones}
|
||||
end
|
||||
end
|
||||
zone_options += options_for_select(convert_zones[priority_zones], selected)
|
||||
zone_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
|
||||
|
||||
|
@ -1,5 +1,7 @@
|
||||
*Edge*
|
||||
|
||||
* Added TimeZone #=~, to support matching zones by regex in time_zone_select. #195 [Ernie Miller]
|
||||
|
||||
* Added Array#second through Array#tenth as aliases for Array#[1] through Array#[9] [DHH]
|
||||
|
||||
* Added test/do declaration style testing to ActiveSupport::TestCase [DHH via Jay Fields]
|
||||
|
Loading…
Reference in New Issue
Block a user