diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-24 19:09:15 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-24 19:09:15 -0500 |
| commit | 416099ca3fab795386b1138b78d9d01d9d5be016 (patch) | |
| tree | 61e4141d658d399eed92e853c9b312866f395322 /actionview/lib | |
| parent | b9440c36dd881ca2643127ba372b2a40e2a4d37b (diff) | |
| parent | 60ed9d62826678006f0c8abde25ee779b1740c3a (diff) | |
| download | rails-416099ca3fab795386b1138b78d9d01d9d5be016.tar.gz rails-416099ca3fab795386b1138b78d9d01d9d5be016.tar.bz2 rails-416099ca3fab795386b1138b78d9d01d9d5be016.zip | |
Merge pull request #14468 from izoomi/date_select_helper
Fix date_select with_css_classes: true option overwriting other html classes
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/date_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb index 1738df9cac..2efb9612ac 100644 --- a/actionview/lib/action_view/helpers/date_helper.rb +++ b/actionview/lib/action_view/helpers/date_helper.rb @@ -965,7 +965,7 @@ module ActionView :name => input_name_from_type(type) }.merge!(@html_options) select_options[:disabled] = 'disabled' if @options[:disabled] - select_options[:class] = type if @options[:with_css_classes] + select_options[:class] = [select_options[:class], type].compact.join(' ') if @options[:with_css_classes] select_html = "\n" select_html << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank] |