aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/validations.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.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.rb')
-rw-r--r--activemodel/lib/active_model/validations.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index c0bbad0396..59e919a364 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -62,7 +62,7 @@ module ActiveModel
attrs = attrs.flatten
# Declare the validation.
- send(validation_method(options[:on] || :save), options) do |record|
+ send(validation_method(options[:on]), options) do |record|
attrs.each do |attr|
value = record.get_attribute_value(attr)
next if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
@@ -74,11 +74,7 @@ module ActiveModel
private
def validation_method(on)
- case on
- when :save then :validate
- when :create then :validate_on_create
- when :update then :validate_on_update
- end
+ :validate
end
end