From 62344a4d94b0400f3a9ee03815bdf9cec3017f08 Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Wed, 24 Feb 2010 18:37:36 +0000 Subject: [PATCH 2/2] Correct ActionView::Helpers::ActiveModelHelper#error_messages_on check for errors on method. --- .../lib/action_view/helpers/active_model_helper.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb index 2f309fc..ec62f21 100644 --- a/actionpack/lib/action_view/helpers/active_model_helper.rb +++ b/actionpack/lib/action_view/helpers/active_model_helper.rb @@ -125,7 +125,7 @@ module ActionView object = convert_to_model(object) if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) && - (errors = obj.errors[method]) + (errors = obj.errors[method]) && !errors.empty? content_tag("div", (options[:prepend_text].html_safe << errors.first).safe_concat(options[:append_text]), :class => options[:css_class] -- 1.6.4.2