diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-17 11:15:58 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-17 11:15:58 -0700 |
| commit | 7511f9794df8f803f28306d378f9fefc28165886 (patch) | |
| tree | 0bcf93f28dd9dd0d4a14d06978e1bcaa008a1fac /activerecord/lib | |
| parent | 59d6df5c695bba671e5e670520f8c5afa5ad193e (diff) | |
| parent | 8510a0bb5a8a65e4bc067ee5a7d98aae965b47a5 (diff) | |
| download | rails-7511f9794df8f803f28306d378f9fefc28165886.tar.gz rails-7511f9794df8f803f28306d378f9fefc28165886.tar.bz2 rails-7511f9794df8f803f28306d378f9fefc28165886.zip | |
Merge pull request #3340 from surfacedamage/exclude_destroy_in_all_blank_check
Exclude _destroy parameter in :all_blank check (issue #2937)
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/nested_attributes.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb index 2dbebfcaf8..d2065d701f 100644 --- a/activerecord/lib/active_record/nested_attributes.rb +++ b/activerecord/lib/active_record/nested_attributes.rb @@ -220,7 +220,7 @@ module ActiveRecord # validates_presence_of :member # end module ClassMethods - REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } } + REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |key, value| key == '_destroy' || value.blank? } } # Defines an attributes writer for the specified association(s). If you # are using <tt>attr_protected</tt> or <tt>attr_accessible</tt>, then you @@ -239,7 +239,8 @@ module ActiveRecord # is specified, a record will be built for all attribute hashes that # do not have a <tt>_destroy</tt> value that evaluates to true. # Passing <tt>:all_blank</tt> instead of a Proc will create a proc - # that will reject a record where all the attributes are blank. + # that will reject a record where all the attributes are blank excluding + # any value for _destroy. # [:limit] # Allows you to specify the maximum number of the associated records that # can be processed with the nested attributes. If the size of the |