Permalink
Browse files

Check if the options hash already exists and merge it with the another

hash.

Closes #2492 and #5615
  • Loading branch information...
1 parent 6ce0a6d commit 32763a82444ba5eb711ec0e5d6380818e5f2695d @rafaelfranca rafaelfranca committed Mar 27, 2012
View
11 actionpack/lib/action_view/helpers/form_helper.rb
@@ -1117,17 +1117,10 @@ def fields_for(record_name, record_object = nil, fields_options = {}, &block)
@template.fields_for(record_name, record_object, fields_options, &block)
end
- def label(method, content_or_options = nil, options = {}, &block)
- if content_or_options.is_a?(Hash)
- content_or_options = objectify_options(content_or_options)
- else
- options = objectify_options(options)
- end
-
- @template.label(@object_name, method, content_or_options, options, &block)
+ def label(method, text = nil, options = {}, &block)
+ @template.label(@object_name, method, text, objectify_options(options), &block)
end
-
def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
@template.check_box(@object_name, method, objectify_options(options), checked_value, unchecked_value)
end
View
6 actionpack/lib/action_view/helpers/tags/label.rb
@@ -3,16 +3,16 @@ module Helpers
module Tags
class Label < Base #:nodoc:
def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
+ options ||= {}
+
content_is_options = content_or_options.is_a?(Hash)
if content_is_options
- options = content_or_options
+ options.merge! content_or_options
@content = nil
else
@content = content_or_options
end
- options ||= {}
-
super(object_name, method_name, template_object, options)
end
View
24 actionpack/test/template/form_helper_test.rb
@@ -1046,10 +1046,24 @@ def test_form_for_with_nil_index_option_override
assert_dom_equal expected, output_buffer
end
+ def test_form_for_label_error_wrapping
+ form_for(@post) do |f|
+ concat f.label(:author_name, :class => 'label')
+ concat f.text_field(:author_name)
+ concat f.submit('Create post')
+ 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'>Author name</label></div>" +
+ "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
+ "<input name='commit' type='submit' value='Create post' />"
+ end
+
+ assert_dom_equal expected, output_buffer
+ end
+
def test_form_for_label_error_wrapping_without_conventional_instance_variable
post = remove_instance_variable :@post
- default_field_error_proc = ActionView::Base.field_error_proc
- ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "<div class='error'>#{html_tag}</div>".html_safe }
form_for(post) do |f|
concat f.label(:author_name, :class => 'label')
@@ -1058,14 +1072,12 @@ def test_form_for_label_error_wrapping_without_conventional_instance_variable
end
expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
- "<div class='error'><label for='post_author_name' class='label'>Author name</label></div>" +
- "<div class='error'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
+ "<div class='field_with_errors'><label for='post_author_name' class='label'>Author name</label></div>" +
+ "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
"<input name='commit' type='submit' value='Create post' />"
end
assert_dom_equal expected, output_buffer
- ensure
- ActionView::Base.field_error_proc = default_field_error_proc
end
def test_form_for_with_namespace

0 comments on commit 32763a8

Please sign in to comment.