mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Revert spurious commit from [9126]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9128 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
bbf738f269
commit
3748d7a0f2
1 changed files with 4 additions and 6 deletions
|
@ -203,9 +203,8 @@ module ActionView
|
||||||
|
|
||||||
alias_method :tag_without_error_wrapping, :tag
|
alias_method :tag_without_error_wrapping, :tag
|
||||||
def tag(name, options)
|
def tag(name, options)
|
||||||
if object.respond_to?("errors") && object.errors.respond_to?("on") && object.errors.on(@method_name)
|
if object.respond_to?("errors") && object.errors.respond_to?("on")
|
||||||
# error_wrapping(tag_without_error_wrapping(name, options), 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' }))
|
|
||||||
else
|
else
|
||||||
tag_without_error_wrapping(name, options)
|
tag_without_error_wrapping(name, options)
|
||||||
end
|
end
|
||||||
|
@ -213,9 +212,8 @@ module ActionView
|
||||||
|
|
||||||
alias_method :content_tag_without_error_wrapping, :content_tag
|
alias_method :content_tag_without_error_wrapping, :content_tag
|
||||||
def content_tag(name, value, options)
|
def content_tag(name, value, options)
|
||||||
if object.respond_to?("errors") && object.errors.respond_to?("on") && object.errors.on(@method_name)
|
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))
|
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' }))
|
|
||||||
else
|
else
|
||||||
content_tag_without_error_wrapping(name, value, options)
|
content_tag_without_error_wrapping(name, value, options)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue