From 889bb4b786941fa2e73163e0b0de10175a999526 Mon Sep 17 00:00:00 2001 From: Alexey Vakhov Date: Sun, 1 Apr 2012 00:52:48 +0400 Subject: Block version of label should wrapped in field_with_errors in case of error --- actionpack/lib/action_view/helpers/tags/label.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_view/helpers/tags/label.rb b/actionpack/lib/action_view/helpers/tags/label.rb index 1c8bf063ea..ee97f8759b 100644 --- a/actionpack/lib/action_view/helpers/tags/label.rb +++ b/actionpack/lib/action_view/helpers/tags/label.rb @@ -33,7 +33,8 @@ module ActionView 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) + label_tag(name_and_id["id"], content, options) else content = if @content.blank? @object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1') -- cgit v1.2.3 From 806f4d8af078884db3b68facb4c04560d449b9eb Mon Sep 17 00:00:00 2001 From: Alexey Vakhov Date: Sun, 1 Apr 2012 10:30:31 +0400 Subject: Small #label method refactoring, thanks @rafaelfranca --- actionpack/lib/action_view/helpers/tags/label.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_view/helpers/tags/label.rb b/actionpack/lib/action_view/helpers/tags/label.rb index ee97f8759b..16135fcd5a 100644 --- a/actionpack/lib/action_view/helpers/tags/label.rb +++ b/actionpack/lib/action_view/helpers/tags/label.rb @@ -34,7 +34,6 @@ module ActionView if block_given? content = @template_object.capture(&block) - label_tag(name_and_id["id"], content, options) else content = if @content.blank? @object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1') @@ -56,9 +55,9 @@ module ActionView 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 -- cgit v1.2.3