diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-07 16:46:18 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-07 16:46:18 -0300 |
commit | 51dd2588433457960cca592d5b5dac6e0537feac (patch) | |
tree | b28ab98e1d42e2f3f784f39a1ec82330143d7685 /activerecord/lib | |
parent | ecb4e4b21b3222b823fa24d4a0598b1f2f63ecfb (diff) | |
parent | 86e3b047ba0349bd88952d4e54504327c3f7e59c (diff) | |
download | rails-51dd2588433457960cca592d5b5dac6e0537feac.tar.gz rails-51dd2588433457960cca592d5b5dac6e0537feac.tar.bz2 rails-51dd2588433457960cca592d5b5dac6e0537feac.zip |
Merge pull request #21069 from dmitry/feature/validate-multiple-contexts-at-once
Validate multiple contexts on `valid?` and `invalid?` at once
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/validations.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index 34d96b19fe..108fe548c8 100644 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -54,7 +54,7 @@ module ActiveRecord # Validations with no <tt>:on</tt> option will run no matter the context. Validations with # some <tt>:on</tt> option will only run in the specified context. def valid?(context = nil) - context ||= (new_record? ? :create : :update) + context ||= default_validation_context output = super(context) errors.empty? && output end @@ -63,6 +63,10 @@ module ActiveRecord protected + def default_validation_context + [new_record? ? :create : :update] + end + def raise_validation_error raise(RecordInvalid.new(self)) end |