diff options
| author | Vasiliy Ermolovich <younash@gmail.com> | 2012-08-23 21:59:22 +0300 |
|---|---|---|
| committer | Vasiliy Ermolovich <younash@gmail.com> | 2012-08-25 18:48:14 +0300 |
| commit | 4b1985578a2b27b170358e82e72e00d23fdaf087 (patch) | |
| tree | 2ffa67a03e2ab280177a7df34bf8f16737b3e249 /actionpack/CHANGELOG.md | |
| parent | b76a96320e967d158d5979b613f8cabad28b7034 (diff) | |
| download | rails-4b1985578a2b27b170358e82e72e00d23fdaf087.tar.gz rails-4b1985578a2b27b170358e82e72e00d23fdaf087.tar.bz2 rails-4b1985578a2b27b170358e82e72e00d23fdaf087.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/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 99ff1c1ede..3f91ba64f5 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 3.2.9 (unreleased) ## +* Fix handling of date selects when using both disabled and discard options. + Fixes #7431. + + *Vasiliy Ermolovich* + * Fix select_tag when option_tags is nil. Fixes #7404. |