backport #7435 #7446

Merged
merged 1 commit into from Aug 25, 2012

Conversation

Projects
None yet
2 participants
Contributor

nashby commented Aug 25, 2012

No description provided.

@nashby nashby 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
4b19855

@rafaelfranca rafaelfranca merged commit dcb2bee into rails:3-2-stable Aug 25, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment