From 31fb0deec16d1911a9c7892089e4d695f90a6425 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Sun, 7 Jan 2007 08:56:57 +0000
Subject: Fix no method error with error_messages_on.  Closes #6935
 [nik.wakelin Koz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5870 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG                                       | 2 ++
 actionpack/lib/action_view/helpers/active_record_helper.rb | 2 +-
 actionpack/test/template/active_record_helper_test.rb      | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index b770419948..c63c5fcc49 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix no method error with error_messages_on.  Closes #6935 [nik.wakelin Koz]
+
 * Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace docs.  Closes #6922 [Steven Bristol]
 
 * Slight doc tweak to #prepend_filter.  Closes #6493 [Jeremy Voorhis]
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb
index fff22d2688..33eaa13898 100644
--- a/actionpack/lib/action_view/helpers/active_record_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -85,7 +85,7 @@ module ActionView
       #   <%= error_message_on "post", "title", "Title simply ", " (or it won't work)", "inputError" %> =>
       #     <div class="inputError">Title simply can't be empty (or it won't work)</div>
       def error_message_on(object, method, prepend_text = "", append_text = "", css_class = "formError")
-        if object = instance_variable_get("@#{object}") && errors = object.errors.on(method)
+        if (obj = instance_variable_get("@#{object}")) && (errors = obj.errors.on(method))
           content_tag("div", "#{prepend_text}#{errors.is_a?(Array) ? errors.first : errors}#{append_text}", :class => css_class)
         else 
           ''
diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb
index c4e5ca66c2..91f744ff83 100644
--- a/actionpack/test/template/active_record_helper_test.rb
+++ b/actionpack/test/template/active_record_helper_test.rb
@@ -174,7 +174,11 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
   def test_error_message_on_handles_nil
     assert_equal "", error_message_on("notthere", "notthere")
   end
-
+  
+  def test_error_message_on
+    assert error_message_on(:post, :author_name)
+  end
+  
   def test_error_messages_for_many_objects
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li><li>User email can't be empty</li></ul></div>), error_messages_for("post", "user")
 
-- 
cgit v1.2.3