From 4cf93935b2478201863c01569e894c9dcf7e9074 Mon Sep 17 00:00:00 2001 From: gbuesing Date: Sun, 29 Jun 2008 13:46:07 -0500 Subject: Fix indentation and update changelogs for previous commit --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_view/helpers/form_options_helper.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d32f7a298f..165db916ee 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -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] diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 75220a2f66..0ca5cebcba 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -315,9 +315,9 @@ module ActionView 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 += "\n" -- cgit v1.2.3