aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2010-08-20 11:08:25 -0400
committerNeeraj Singh <neerajdotname@gmail.com>2010-08-20 11:08:25 -0400
commit87398e531d0bb23b30787fe26d86678dba322895 (patch)
tree0e336e14547155bc49775063e59fe1993cbaede6
parentc24aa2f2dca52e1b0ee644e407389f6e89f53007 (diff)
downloadrails-87398e531d0bb23b30787fe26d86678dba322895.tar.gz
rails-87398e531d0bb23b30787fe26d86678dba322895.tar.bz2
rails-87398e531d0bb23b30787fe26d86678dba322895.zip
Patch for Lighthouse ticket #5419 has been been applied. So reverting this one.
Revert "documentation regarding after_validation" This reverts commit c24aa2f2dca52e1b0ee644e407389f6e89f53007.
-rw-r--r--activemodel/lib/active_model/validations/callbacks.rb4
-rw-r--r--activerecord/lib/active_record/callbacks.rb2
2 files changed, 1 insertions, 5 deletions
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb
index c3e74bcc8b..afd65d3dd5 100644
--- a/activemodel/lib/active_model/validations/callbacks.rb
+++ b/activemodel/lib/active_model/validations/callbacks.rb
@@ -14,13 +14,11 @@ module ActiveModel
# include ActiveModel::Validations::Callbacks
#
# before_validation :do_stuff_before_validation
- # after_validation :do_stuff_after_validation
+ # after_validation :do_tuff_after_validation
# end
#
# Like other before_* callbacks if <tt>before_validation</tt> returns false
# then <tt>valid?</tt> will not be called.
- #
- # If validation fails then <tt>after_validation</tt> will not be called.
extend ActiveSupport::Concern
included do
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 78e284699e..c203581735 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -25,8 +25,6 @@ module ActiveRecord
# Check out <tt>ActiveRecord::Transactions</tt> for more details about <tt>after_commit</tt> and
# <tt>after_rollback</tt>.
#
- # Note that if validation fails then <tt>after_validation</tt> will not be invoked .
- #
# That's a total of ten callbacks, which gives you immense power to react and prepare for each state in the
# Active Record lifecycle. The sequence for calling <tt>Base#save</tt> for an existing record is similar,
# except that each <tt>_on_create</tt> callback is replaced by the corresponding <tt>_on_update</tt> callback.