diff options
| author | Zachary Scott <e@zzak.io> | 2014-10-03 17:29:25 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-10-03 17:29:25 -0700 |
| commit | 44e6d91a07c26cfd7d7b5360cc9a8184b0692859 (patch) | |
| tree | 64a011d3f71d422579afb3d1179577a95eb45fba /activerecord | |
| parent | cad635995ca945d4137d0aab64d46313aee4f556 (diff) | |
| parent | 2bb0abbec0e4abe843131f188129a1189b1bf714 (diff) | |
| download | rails-44e6d91a07c26cfd7d7b5360cc9a8184b0692859.tar.gz rails-44e6d91a07c26cfd7d7b5360cc9a8184b0692859.tar.bz2 rails-44e6d91a07c26cfd7d7b5360cc9a8184b0692859.zip | |
Merge pull request #16409 from justinweiss/update_validation_context_documentation
Docs: Add a note on custom validation contexts. [ci skip]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/validations/associated.rb | 8 | ||||
| -rw-r--r-- | activerecord/lib/active_record/validations/presence.rb | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/validations/associated.rb b/activerecord/lib/active_record/validations/associated.rb index b4785d3ba4..47ccef31a5 100644 --- a/activerecord/lib/active_record/validations/associated.rb +++ b/activerecord/lib/active_record/validations/associated.rb @@ -29,9 +29,11 @@ module ActiveRecord # Configuration options: # # * <tt>:message</tt> - A custom error message (default is: "is invalid"). - # * <tt>:on</tt> - Specifies when this validation is active. Runs in all - # validation contexts by default (+nil+), other options are <tt>:create</tt> - # and <tt>:update</tt>. + # * <tt>:on</tt> - Specifies the contexts where this validation is active. + # Runs in all validation contexts by default (nil). You can pass a symbol + # or an array of symbols. (e.g. <tt>on: :create</tt> or + # <tt>on: :custom_validation_context</tt> or + # <tt>on: [:create, :custom_validation_context]</tt>) # * <tt>:if</tt> - Specifies a method, proc or string to call to determine # if the validation should occur (e.g. <tt>if: :allow_validation</tt>, # or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method, diff --git a/activerecord/lib/active_record/validations/presence.rb b/activerecord/lib/active_record/validations/presence.rb index e586744818..c7aa814ba8 100644 --- a/activerecord/lib/active_record/validations/presence.rb +++ b/activerecord/lib/active_record/validations/presence.rb @@ -44,9 +44,11 @@ module ActiveRecord # # Configuration options: # * <tt>:message</tt> - A custom error message (default is: "can't be blank"). - # * <tt>:on</tt> - Specifies when this validation is active. Runs in all - # validation contexts by default (+nil+), other options are <tt>:create</tt> - # and <tt>:update</tt>. + # * <tt>:on</tt> - Specifies the contexts where this validation is active. + # Runs in all validation contexts by default (nil). You can pass a symbol + # or an array of symbols. (e.g. <tt>on: :create</tt> or + # <tt>on: :custom_validation_context</tt> or + # <tt>on: [:create, :custom_validation_context]</tt>) # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if # the validation should occur (e.g. <tt>if: :allow_validation</tt>, or # <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method, proc |