diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-30 14:37:55 -0700 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-30 14:37:55 -0700 |
commit | 9517aff899ef30ab8b5542b0483cd45fcd545a99 (patch) | |
tree | 153ec4aa75428fa7477e0cb8c10dc86c93e4432d /activemodel | |
parent | 996f9b5873e80cfc2255b4e28755165fc8e55d83 (diff) | |
parent | 5fe43ffcfb123b838f48c0775bcd3bf4fc1b8b73 (diff) | |
download | rails-9517aff899ef30ab8b5542b0483cd45fcd545a99.tar.gz rails-9517aff899ef30ab8b5542b0483cd45fcd545a99.tar.bz2 rails-9517aff899ef30ab8b5542b0483cd45fcd545a99.zip |
Merge pull request #11196 from yangchenyun/remove_evals_in_am_callbacks
Remove evals from AM::Validations::Callbacks
Diffstat (limited to 'activemodel')
-rw-r--r-- | activemodel/lib/active_model/validations/callbacks.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb index cabb9482f2..fde53b9f89 100644 --- a/activemodel/lib/active_model/validations/callbacks.rb +++ b/activemodel/lib/active_model/validations/callbacks.rb @@ -58,7 +58,9 @@ module ActiveModel if options.is_a?(Hash) && options[:on] options[:if] = Array(options[:if]) options[:on] = Array(options[:on]) - options[:if].unshift("#{options[:on]}.include? self.validation_context") + options[:if].unshift lambda { |o| + options[:on].include? o.validation_context + } end set_callback(:validation, :before, *args, &block) end |