aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-01-13 13:15:19 -0800
committerSteve Klabnik <steve@steveklabnik.com>2013-01-13 13:15:19 -0800
commit2d35e58a05c5917a275ac164135a686b40ac544f (patch)
tree993f703aad6f96a595af08c088213caf4fca571a /actionpack/lib
parent4e7c8f8bb830306f328025d8dad23ba081176668 (diff)
parentaea3820261c5bba9afcc775bf78d997e43db42f0 (diff)
downloadrails-2d35e58a05c5917a275ac164135a686b40ac544f.tar.gz
rails-2d35e58a05c5917a275ac164135a686b40ac544f.tar.bz2
rails-2d35e58a05c5917a275ac164135a686b40ac544f.zip
Merge pull request #8925 from colinbm/date_select_value
Allow to override the value on date_select
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/tags/date_select.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/tags/date_select.rb b/actionpack/lib/action_view/helpers/tags/date_select.rb
index 6c400f85cb..f073c63f73 100644
--- a/actionpack/lib/action_view/helpers/tags/date_select.rb
+++ b/actionpack/lib/action_view/helpers/tags/date_select.rb
@@ -27,7 +27,7 @@ module ActionView
end
def datetime_selector(options, html_options)
- datetime = value(object) || default_datetime(options)
+ datetime = options[:value] || value(object) || default_datetime(options)
@auto_index ||= nil
options = options.dup