diff options
| author | gbuesing <gbuesing@gmail.com> | 2008-06-29 13:46:07 -0500 |
|---|---|---|
| committer | gbuesing <gbuesing@gmail.com> | 2008-06-29 13:46:07 -0500 |
| commit | 4cf93935b2478201863c01569e894c9dcf7e9074 (patch) | |
| tree | 9b2b7c32e7cba4fed7e98c7f2cb99435ce7bb423 | |
| parent | d0092dc44d580f4179308c7394d9023098406f79 (diff) | |
| download | rails-4cf93935b2478201863c01569e894c9dcf7e9074.tar.gz rails-4cf93935b2478201863c01569e894c9dcf7e9074.tar.bz2 rails-4cf93935b2478201863c01569e894c9dcf7e9074.zip | |
Fix indentation and update changelogs for previous commit
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 4 | ||||
| -rw-r--r-- | activesupport/CHANGELOG | 2 |
3 files changed, 6 insertions, 2 deletions
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 += "<option value=\"\" disabled=\"disabled\">-------------</option>\n" diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 4f61311d95..a540150329 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -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] |