From f9243e3b786a4d113b1bb2005acfad8f05bd3280 Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Thu, 1 May 2008 12:10:18 +1000
Subject: [PATCH] adds ActionView class method to set default order option for date and time form helpers

---
 actionpack/lib/action_view/helpers/date_helper.rb |   10 +++++++-
 actionpack/test/template/date_helper_test.rb      |   24 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 9f7790d..c7a9209 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -108,7 +108,8 @@ module ActionView
       # discard options. The discard options are <tt>:discard_year</tt>, <tt>:discard_month</tt> and <tt>:discard_day</tt>. Set to true, they'll
       # drop the respective select. Discarding the month select will also automatically discard the day select. It's also possible to explicitly
       # set the order of the tags using the <tt>:order</tt> option with an array of symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in
-      # the desired order. Symbols may be omitted and the respective select is not included.
+      # the desired order. Symbols may be omitted and the respective select is not included. The default <tt>:order</tt> for your application 
+      # maybe specified in an initializer file by changing the ActionView::Base.default_date_select_order value.
       #
       # Pass the <tt>:default</tt> option to set the default date. Use a Time object or a Hash of :year, :month, :day, :hour, :minute, and :second.
       #
@@ -619,7 +620,7 @@ module ActionView
 
           position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
 
-          order = (options[:order] ||= [:year, :month, :day])
+          order = (options[:order] ||= ActionView::Base.default_date_select_order)
 
           # Discard explicit and implicit by not being included in the :order
           discard = {}
@@ -707,4 +708,9 @@ module ActionView
       end
     end
   end
+  
+  class Base
+    cattr_accessor :default_date_select_order
+    self.default_date_select_order = [:year, :month, :day]
+  end
 end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 2373600..1949c79 100755
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1065,7 +1065,31 @@ class DateHelperTest < ActionView::TestCase
 
     assert_dom_equal expected, date_select("post", "written_on", :order => [:day, :month, :year])
   end
+  
+  def test_default_date_select_order
+    old_default_date_select_order = ActionView::Base.default_date_select_order
+    ActionView::Base.default_date_select_order = [:day, :month, :year]
+    
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+    
+    expected =  %{<select id="post_written_on_3i" name="post[written_on(3i)]">\n}
+    1.upto(31) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 15}>#{i}</option>\n) }
+    expected << "</select>\n"
 
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    1.upto(12) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 6}>#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+
+    expected <<  %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    1999.upto(2009) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 2004}>#{i}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on")
+  ensure
+    ActionView::Base.default_date_select_order = old_default_date_select_order
+  end
+  
   def test_date_select_with_nil
     @post = Post.new
 
-- 
1.5.5.1