diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2011-12-26 04:09:35 -0800 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2011-12-26 04:09:35 -0800 |
| commit | 76f0fa6066b78cd8f0e139dff4a7b65c96db5778 (patch) | |
| tree | dbe1725d0b698dc15e42525771e9e9c438bd62f4 /actionpack/lib | |
| parent | 28cd098d99c52486aecb72aab39105d8abcd52ad (diff) | |
| parent | f7669cd8344a83485d01f94e7b5896616cd57f51 (diff) | |
| download | rails-76f0fa6066b78cd8f0e139dff4a7b65c96db5778.tar.gz rails-76f0fa6066b78cd8f0e139dff4a7b65c96db5778.tar.bz2 rails-76f0fa6066b78cd8f0e139dff4a7b65c96db5778.zip | |
Merge pull request #4154 from nashby/include-blank-date-helper
a prompt string in include_blank option for date helpers
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 2806348337..cf24f27536 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -13,7 +13,7 @@ module ActionView # # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday" # would give birthday[month] instead of date[month] if passed to the <tt>select_month</tt> method. - # * <tt>:include_blank</tt> - set to true if it should be possible to set an empty date. + # * <tt>:include_blank</tt> - set to true or to a prompt string if it should be possible to set an empty date. # * <tt>:discard_type</tt> - set to true if you want to discard the type part of the select name. If set to true, # the <tt>select_month</tt> method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead # of "date[month]". @@ -887,7 +887,7 @@ module ActionView select_options.merge!(:disabled => 'disabled') if @options[:disabled] select_html = "\n" - select_html << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank] + select_html << content_tag(:option, "#{ERB::Util.html_escape(@options[:include_blank]) if @options[:include_blank].kind_of?(String)}", :value => '') + "\n" if @options[:include_blank] select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt] select_html << select_options_as_html |