Changeset 8473

Timestamp:

12/21/07 22:18:07 (9 months ago)

Author:

bitsweat

Message:

Add :default option to time_zone_select. Closes #10590.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/form_options_helper.rb (modified) (2 diffs)
• trunk/actionpack/test/template/form_options_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Add :default option to time_zone_select.  #10590 [Matt Aimonetti]
+
+
-*2.0.2* (December 16th, 2007)
-

trunk/actionpack/lib/action_view/helpers/form_options_helper.rb

@@ -132 +132 @@
-      # zone model object. (See #time_zone_options_for_select for more
-      # information.)
+      # Finally, this method supports a <tt>:default</tt> option, which selects
+      # a default TimeZone if the object's time zone is nil.
+      #
+      # Examples:
+      #   time_zone_select( "user", "time_zone", nil, :include_blank => true)
+      #
+      #   time_zone_select( "user", "time_zone", nil, :default => "Pacific Time (US & Canada)" )
+      #
+      #   time_zone_select( "user", 'time_zone', TimeZone.us_zones, :default => "Pacific Time (US & Canada)")
+      #
+      #   time_zone_select( "user", "time_zone", TZInfo::Timezone.all.sort, :model => TZInfo::Timezone)
-      def time_zone_select(object, method, priority_zones = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, nil, options.delete(:object)).to_time_zone_select_tag(priority_zones, options, html_options)
@@ -386 +397 @@
-        content_tag("select",
-          add_options(
-
+ || options[:default]
-            options, value
-          ), html_options

trunk/actionpack/test/template/form_options_helper_test.rb

@@ -1295 +1295 @@
-                 html
-  end
+
+  def test_time_zone_select_with_default_time_zone_and_nil_value
+     @firm = Firm.new()
+     @firm.time_zone = nil
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                   "<option value=\"A\">A</option>\n" +
+                   "<option value=\"B\" selected=\"selected\">B</option>\n" +
+                   "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\">D</option>\n" +
+                   "<option value=\"E\">E</option>" +
+                   "</select>",
+                   html
+  end
+
+  def test_time_zone_select_with_default_time_zone_and_value
+     @firm = Firm.new('D')
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                   "<option value=\"A\">A</option>\n" +
+                   "<option value=\"B\">B</option>\n" +
+                   "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                   "<option value=\"E\">E</option>" +
+                   "</select>",
+                   html
+  end
+
-end