github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-10 14:15:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert spurious commit from [9126]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9128 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2008-03-29 00:26:15 +00:00
parent bbf738f269
commit 3748d7a0f2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
actionpack/lib/action_view/helpers/active_record_helper.rb
View File

@@ -203,9 +203,8 @@ module ActionView
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 @@ module ActionView
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