diff options
| author | Vasiliy Ermolovich <younash@gmail.com> | 2012-08-23 21:59:22 +0300 |
|---|---|---|
| committer | Vasiliy Ermolovich <younash@gmail.com> | 2012-08-25 19:02:41 +0300 |
| commit | 130fe2b172afb81979e72fbf30edf945147cb78f (patch) | |
| tree | f3cc50274fca7d62002ad0852527cc6f122266be /actionpack/lib/action_view | |
| parent | dfb5898b6dd448a6867dcd26ebcbe0835b26a1e2 (diff) | |
| download | rails-130fe2b172afb81979e72fbf30edf945147cb78f.tar.gz rails-130fe2b172afb81979e72fbf30edf945147cb78f.tar.bz2 rails-130fe2b172afb81979e72fbf30edf945147cb78f.zip | |
correct handling of date selects when using both disabled and discard options
we should take disabled option not only from `html_options` hash but from
`options` hash too like `build_select` method does it. So
datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true })
datetime_select("post", "updated_at", :discard_minute => true , :disabled => true)
both these variants work now
closes #7431
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 096ad12892..795440cacc 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -963,12 +963,15 @@ module ActionView # build_hidden(:year, 2008) # => "<input id="post_written_on_1i" name="post[written_on(1i)]" type="hidden" value="2008" />" def build_hidden(type, value) - (tag(:input, { + select_options = { :type => "hidden", :id => input_id_from_type(type), :name => input_name_from_type(type), :value => value - }.merge(@html_options.slice(:disabled))) + "\n").html_safe + }.merge(@html_options.slice(:disabled)) + select_options.merge!(:disabled => 'disabled') if @options[:disabled] + + tag(:input, select_options) + "\n".html_safe end # Returns the name attribute for the input tag. |