From 22ad30ed600a3304c749b0406325b3b43de3d607 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Sat, 21 Mar 2009 01:11:38 +0000 Subject: Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord --- activemodel/lib/active_model/validations.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'activemodel/lib/active_model/validations.rb') 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 -- cgit v1.2.3