diff options
| author | Marcel Molina <marcel@vernix.org> | 2007-12-05 14:24:39 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2007-12-05 14:24:39 +0000 |
| commit | 7f671f4ae5654cdbd8b21362fc0056abbfa42667 (patch) | |
| tree | b39bf1cb0a66a473bfc2bf7e4e82ea8c60154b5a /activerecord | |
| parent | e4d845ef54ff348afc8516c9168654ae6cd327c7 (diff) | |
| download | rails-7f671f4ae5654cdbd8b21362fc0056abbfa42667.tar.gz rails-7f671f4ae5654cdbd8b21362fc0056abbfa42667.tar.bz2 rails-7f671f4ae5654cdbd8b21362fc0056abbfa42667.zip | |
Document the :message option for validates_associated. Closes #10357 [dylans]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8281 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/validations.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 3d4d2aea2e..e3b5d22721 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Document the :message option for validates_associated. Closes #10357 [dylans] + * Document automatically generated predicate methods for attributes. Closes #10373 [chuyeow] * Added ActiveRecord::Base#becomes to turn a record into one of another class (mostly relevant for STIs) [DHH]. Example: diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index 0ee8f84c62..3b8ffe4e06 100755 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -777,6 +777,7 @@ module ActiveRecord # is both present and guaranteed to be valid, you also need to use validates_presence_of. # # Configuration options: + # * <tt>message</tt> - A custom error message (default is: "is invalid") # * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update) # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }). The |