Ticket #8270: more_options_on_error_messages_for_with_tests.diff

test/template/active_record_helper_test.rb

@@ -202 +202 @@
-
-    # should space object name
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this chunky bacon from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => "chunky_bacon")
+
+    # hide header and explanation messages with nil or empty string
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :header_message => nil, :message => "")
+
+    # override header and explanation messages
+    header_message = "Yikes! Some errors"
+    message = "Please fix the following fields and resubmit:"
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>#{header_message}</h2><p>#{message}</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :header_message => header_message, :message => message)
-  end
-
-  def test_form_with_string_multipart

lib/action_view/helpers/active_record_helper.rb

@@ -101 +101 @@
-      # * <tt>header_tag</tt> - Used for the header of the error div (default: h2)
-      # * <tt>id</tt> - The id of the error div (default: errorExplanation)
-      # * <tt>class</tt> - The class of the error div (default: errorExplanation)
-
-any text that you prefer. If <tt>object_name</tt> is not set, the name of
-the first object will be used.
+ any text that you prefer.  If <tt>object_name</tt> is not set, the name of the first object will be used.
+* <tt>header_message</tt> - The message in the header of the error div.  Pass +nil+ or an empty string to avoid the header message altogether.  (default: X errors prohibited this object from being saved)
+* <tt>message</tt> - The explanation message after the header message and before the error list.  Pass +nil+ or an empty string to avoid the explanation message altogether.  (default: There were problems with the following fields:)
-      #
-      # To specify the display for one object, you simply provide its name as a parameter.  For example, for the +User+ model:
-      # 
@@ -131 +131 @@
-              html[key] = 'errorExplanation'
-            end
-          end
-
+
+
+
+
-          error_messages = objects.map {|object| object.errors.full_messages.map {|msg| content_tag(:li, msg) } }
-_tag(:div,
-  content_tag(options[:header_tag] || :h2, header_message) <<
-    content_tag(:p, 'There were problems with the following fields:') <<
-    content_tag(:ul, error_messages),
-  html
-
+s = ''
+contents << content_tag(options[:header_tag] || :h2, options[:header_message]) unless options[:header_message].blank?
+contents << content_tag(:p, options[:message]) unless options[:message].blank?
+contents << content_tag(:ul, error_messages)
+
+content_tag(:div, contents, html
-        else
-          ''
-        end