Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert spurious commit from [9126]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9128 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 3748d7a0f2a2826cfb9aa8fdde5789fa62b0de34 1 parent bbf738f
@jeremy jeremy authored
Showing with 4 additions and 6 deletions.
  1. +4 −6 actionpack/lib/action_view/helpers/active_record_helper.rb
View
10 actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -203,9 +203,8 @@ def to_tag(options = {})
alias_method :tag_without_error_wrapping, :tag
def tag(name, options)
- if object.respond_to?("errors") && object.errors.respond_to?("on") && object.errors.on(@method_name)
- # error_wrapping(tag_without_error_wrapping(name, options), object.errors.on(@method_name))
- tag_without_error_wrapping(name, options.merge({ "class" => options["class"] ? "#{options["class"]} errors" : 'errors' }))
+ if object.respond_to?("errors") && object.errors.respond_to?("on")
+ error_wrapping(tag_without_error_wrapping(name, options), object.errors.on(@method_name))
else
tag_without_error_wrapping(name, options)
end
@@ -213,9 +212,8 @@ def tag(name, options)
alias_method :content_tag_without_error_wrapping, :content_tag
def content_tag(name, value, options)
- if object.respond_to?("errors") && object.errors.respond_to?("on") && object.errors.on(@method_name)
- # error_wrapping(content_tag_without_error_wrapping(name, value, options), object.errors.on(@method_name))
- content_tag_without_error_wrapping(name, value, options.merge({ "class" => options["class"] ? "#{options["class"]} errors" : 'errors' }))
+ if object.respond_to?("errors") && object.errors.respond_to?("on")
+ error_wrapping(content_tag_without_error_wrapping(name, value, options), object.errors.on(@method_name))
else
content_tag_without_error_wrapping(name, value, options)
end
Please sign in to comment.
Something went wrong with that request. Please try again.