Skip to content
Browse files

Merge pull request #5691 from avakhov/form-label-block

Block version of label should wrapped in field_with_errors in case of error
  • Loading branch information...
2 parents 9228aa6 + 806f4d8 commit eb154c529991ed77cd13035e6582178156ba9b32 @josevalim josevalim committed Apr 1, 2012
Showing with 17 additions and 3 deletions.
  1. +3 −3 actionpack/lib/action_view/helpers/tags/label.rb
  2. +14 −0 actionpack/test/template/form_helper_test.rb
View
6 actionpack/lib/action_view/helpers/tags/label.rb
@@ -33,7 +33,7 @@ def render(&block)
options["for"] = name_and_id["id"] unless options.key?("for")
if block_given?
- @template_object.label_tag(name_and_id["id"], options, &block)
+ content = @template_object.capture(&block)
else
content = if @content.blank?
@object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1')
@@ -55,9 +55,9 @@ def render(&block)
end
content ||= @method_name.humanize
-
- label_tag(name_and_id["id"], content, options)
end
+
+ label_tag(name_and_id["id"], content, options)
end
end
end
View
14 actionpack/test/template/form_helper_test.rb
@@ -1080,6 +1080,20 @@ def test_form_for_label_error_wrapping_without_conventional_instance_variable
assert_dom_equal expected, output_buffer
end
+ def test_form_for_label_error_wrapping_block_and_non_block_versions
+ form_for(@post) do |f|
+ concat f.label(:author_name, 'Name', :class => 'label')
+ concat f.label(:author_name, :class => 'label') { 'Name' }
+ end
+
+ expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+ "<div class='field_with_errors'><label for='post_author_name' class='label'>Name</label></div>" +
+ "<div class='field_with_errors'><label for='post_author_name' class='label'>Name</label></div>"
+ end
+
+ assert_dom_equal expected, output_buffer
+ end
+
def test_form_for_with_namespace
form_for(@post, :namespace => 'namespace') do |f|
concat f.text_field(:title)

0 comments on commit eb154c5

Please sign in to comment.
Something went wrong with that request. Please try again.