aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/validations/inclusion.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-03-21 01:11:38 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-03-21 01:11:38 +0000
commit22ad30ed600a3304c749b0406325b3b43de3d607 (patch)
tree905cab2c383e73b3d22aa646ac1ad66ffca33a6f /activemodel/lib/active_model/validations/inclusion.rb
parent6173e5bfaec44729ecabc2e6e05aa2608a85981f (diff)
downloadrails-22ad30ed600a3304c749b0406325b3b43de3d607.tar.gz
rails-22ad30ed600a3304c749b0406325b3b43de3d607.tar.bz2
rails-22ad30ed600a3304c749b0406325b3b43de3d607.zip
Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord
Diffstat (limited to 'activemodel/lib/active_model/validations/inclusion.rb')
-rw-r--r--activemodel/lib/active_model/validations/inclusion.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index 0cb8e44770..a4bc8fe035 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -21,8 +21,7 @@ module ActiveModel
# not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
# method, proc or string should return or evaluate to a true or false value.
def validates_inclusion_of(*attr_names)
- configuration = { :on => :save }
- configuration.update(attr_names.extract_options!)
+ configuration = attr_names.extract_options!
enum = configuration[:in] || configuration[:within]