TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Improve previous patch a bit [#3645 state:resolved]

Browse Source
This commit is contained in:
José Valim 2010-05-15 09:08:40 +02:00
parent 6e69b42b21
commit d18a2742e0
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/lib/action_view/helpers/form_helper.rb
View File

@ -576,12 +576,12 @@ def fields_for(record_or_name_or_array, *args, &block)
# label(:post, :terms) do
# 'Accept <a href="/terms">Terms</a>.'
# end
def label(object_name, method, content_or_options_with_block = nil, options = nil, &block)
def label(object_name, method, content_or_options = nil, options = nil, &block)
if block_given?
options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
options = content_or_options if content_or_options.is_a?(Hash)
text = nil
else
text = content_or_options_with_block
text = content_or_options
end
options ||= {}

9
actionpack/lib/action_view/helpers/form_tag_helper.rb
View File

@ -156,15 +156,12 @@ def text_field_tag(name, value = nil, options = {})
#
# label_tag 'name', nil, :class => 'small_label'
# # => <label for="name" class="small_label">Name</label>
def label_tag(name = nil, content_or_options_with_block = nil, options = nil, &block)
if block_given?
options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
end
def label_tag(name = nil, content_or_options = nil, options = nil, &block)
options = content_or_options if block_given? && content_or_options.is_a?(Hash)
options ||= {}
options.stringify_keys!
options["for"] = sanitize_to_id(name) unless name.blank? || options.has_key?("for")
content_tag :label, content_or_options_with_block || name.to_s.humanize, options, &block
content_tag :label, content_or_options || name.to_s.humanize, options, &block
end
# Creates a hidden form input field used to transmit data that would be lost due to HTTP's statelessness or

5
actionpack/test/template/form_tag_helper_test.rb
View File

@ -297,6 +297,11 @@ def test_label_tag_with_block_and_argument
assert_dom_equal('<label for="clock">Grandfather</label>', output)
end
def test_label_tag_with_block_and_argument_and_options
output = label_tag("clock", :id => "label_clock") { "Grandfather" }
assert_dom_equal('<label for="clock" id="label_clock">Grandfather</label>', output)
end
def test_boolean_options
assert_dom_equal %(<input checked="checked" disabled="disabled" id="admin" name="admin" readonly="readonly" type="checkbox" value="1" />), check_box_tag("admin", 1, true, 'disabled' => true, :readonly => "yes")
assert_dom_equal %(<input checked="checked" id="admin" name="admin" type="checkbox" value="1" />), check_box_tag("admin", 1, true, :disabled => false, :readonly => nil)