kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Merge pull request #4154 from nashby/include-blank-date-helper"

Browse source 
This reverts commit 76f0fa6066, reversing
changes made to 28cd098d99.
This commit is contained in:
Piotr Sarnacki 2011-12-26 13:56:47 +01:00
parent 76f0fa6066
commit 719ba0b6bb
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionpack/lib/action_view/helpers/date_helper.rb
View file

@ -13,7 +13,7 @@ module ActionView
# #
# * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday" # * <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. # would give birthday[month] instead of date[month] if passed to the <tt>select_month</tt> method.
# * <tt>:include_blank</tt> - set to true or to a prompt string if it should be possible to set an empty date. # * <tt>:include_blank</tt> - set to true 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, # * <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 # the <tt>select_month</tt> method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead
# of "date[month]". # of "date[month]".
@ -887,7 +887,7 @@ module ActionView
select_options.merge!(:disabled => 'disabled') if @options[:disabled] select_options.merge!(:disabled => 'disabled') if @options[:disabled]
select_html = "\n" select_html = "\n"
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 << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank]
select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt] select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt]
select_html << select_options_as_html select_html << select_options_as_html

20
actionpack/test/template/date_helper_test.rb
View file

@ -1581,26 +1581,6 @@ class DateHelperTest < ActionView::TestCase
assert_dom_equal expected, date_select("post", "written_on", :include_blank => true) assert_dom_equal expected, date_select("post", "written_on", :include_blank => true)
end end
def test_date_select_with_stringified_blank
@post = Post.new
start_year = Time.now.year-5
end_year = Time.now.year+5
expected = '<input name="post[written_on(3i)]" type="hidden" id="post_written_on_3i"/>' + "\n"
expected << %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
expected << "<option value=\"\">blank</option>\n"
start_year.upto(end_year) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
expected << "</select>\n"
expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
expected << "<option value=\"\">blank</option>\n"
1.upto(12) { |i| expected << %(<option value="#{i}">#{Date::MONTHNAMES[i]}</option>\n) }
expected << "</select>\n"
assert_dom_equal expected, date_select("post", "written_on", :order=>[:year, :month], :include_blank=> 'blank')
end
def test_date_select_with_nil_and_blank_and_order def test_date_select_with_nil_and_blank_and_order
@post = Post.new @post = Post.new