TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #11054 from senny/11048_make_default_value_explicit

Browse Source 
make default value for `:message` on `AM::Errors` explicit.
This commit is contained in:
Carlos Antonio da Silva 2013-06-27 05:16:38 -07:00
commit 48ab2c06e0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemodel/lib/active_model/errors.rb
View File

@ -289,7 +289,7 @@ def to_hash(full_messages = false)
# # => NameIsInvalid: name is invalid
#
# person.errors.messages # => {}
def add(attribute, message = nil, options = {})
def add(attribute, message = :invalid, options = {})
message = normalize_message(attribute, message, options)
if exception = options[:strict]
exception = ActiveModel::StrictValidationFailed if exception == true
@ -331,7 +331,7 @@ def add_on_blank(attributes, options = {})
#
# person.errors.add :name, :blank
# person.errors.added? :name, :blank # => true
def added?(attribute, message = nil, options = {})
def added?(attribute, message = :invalid, options = {})
message = normalize_message(attribute, message, options)
self[attribute].include? message
end
@ -437,8 +437,6 @@ def generate_message(attribute, type = :invalid, options = {})
private
def normalize_message(attribute, message, options)
message ||= :invalid
case message
when Symbol
generate_message(attribute, message, options.except(*CALLBACKS_OPTIONS))