diff options
| author | Jeroen van Dijk <jeroen@jeevidee.nl> | 2010-05-15 19:43:45 +0200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-15 11:17:58 -0700 |
| commit | bc1c8d58ec45593acba614d1d0fecb49adef08ff (patch) | |
| tree | 5515d6211f61cc86804a6580b9d2ec1c710b9db0 /activemodel/lib/active_model/validations/acceptance.rb | |
| parent | 47c9a355062888feb2c7ea7c794e914a9b78f50c (diff) | |
| download | rails-bc1c8d58ec45593acba614d1d0fecb49adef08ff.tar.gz rails-bc1c8d58ec45593acba614d1d0fecb49adef08ff.tar.bz2 rails-bc1c8d58ec45593acba614d1d0fecb49adef08ff.zip | |
Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options hash and make various Validators pass their (filtered) options.
This makes it possible to pass additional options through Validators to message
generation. E.g. plugin authors want to add validates_presence_of :foo, :format
=> "some format".
Also, cleanup the :default vs :message options confusion in ActiveModel
validation message generation.
Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in
favor of ActiveModel::Errors#add_on_blank(attributes, options).
Original patch by Sven Fuchs, some minor changes and has been changed to be applicable to master again
[#4057 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activemodel/lib/active_model/validations/acceptance.rb')
| -rw-r--r-- | activemodel/lib/active_model/validations/acceptance.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations/acceptance.rb b/activemodel/lib/active_model/validations/acceptance.rb index 26b12b504b..ced083b312 100644 --- a/activemodel/lib/active_model/validations/acceptance.rb +++ b/activemodel/lib/active_model/validations/acceptance.rb @@ -7,7 +7,7 @@ module ActiveModel def validate_each(record, attribute, value) unless value == options[:accept] - record.errors.add(attribute, :accepted, :default => options[:message]) + record.errors.add(attribute, :accepted, options) end end |