diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-03-05 19:40:41 -0200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-05 13:49:04 -0800 |
| commit | e472f76e4c86cfc1350f3b769d9ac3d96f062e3f (patch) | |
| tree | 54783961cd878e69412950e71df167f149dc83c2 /actionpack/lib/action_view/helpers/date_helper.rb | |
| parent | 8fc97d198ef31c1d7a4b9b849b96fc08a667fb02 (diff) | |
| download | rails-e472f76e4c86cfc1350f3b769d9ac3d96f062e3f.tar.gz rails-e472f76e4c86cfc1350f3b769d9ac3d96f062e3f.tar.bz2 rails-e472f76e4c86cfc1350f3b769d9ac3d96f062e3f.zip | |
Adds disable option to date_helpers generated hidden fields when html_options specifies it. ht by Marc Schütz
[#3807 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_view/helpers/date_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 89ac682c18..42018ee261 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -1,5 +1,6 @@ require "date" require 'action_view/helpers/tag_helper' +require 'active_support/core_ext/hash/slice' module ActionView module Helpers @@ -865,7 +866,7 @@ module ActionView :id => input_id_from_type(type), :name => input_name_from_type(type), :value => value - }) + "\n").html_safe + }.merge(@html_options.slice(:disabled))) + "\n").html_safe end # Returns the name attribute for the input tag |