Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | ActiveRecord::Relation#primary_key should return a string, just like ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 | |
| | | | | | | | | ActiveRecord::Base.primary_key does. | |||||
| * | Let AssociationCollection#find use #scoped to do its finding. Note that I am ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 | |
| | | | | | | | | removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences. | |||||
| * | When a has_many association is not :uniq, appending the same record multiple ↵ | Jon Leighton | 2010-12-23 | 1 | -1/+12 | |
| | | | | | | | | times should append it to the @target multiple times [#5964 state:resolved] | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 1 | -13/+13 | |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | |||||
| * | If a nested_attribute is being marked for destruction and at the same time ↵ | Neeraj Singh | 2010-11-24 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | | an attr_accessor value is being assigned then the value being assigned is being ignored. This patch is a fix for that issue. [#5939 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Remove unneeded local var. | Emilio Tagua | 2010-11-24 | 1 | -2/+1 | |
| | | ||||||
| * | Remove uneeded local var definition. | Emilio Tagua | 2010-11-24 | 1 | -2/+1 | |
| | | ||||||
| * | class inheritable attributes is used no more! all internal use of class ↵ | Josh Kalderimis | 2010-11-20 | 1 | -4/+9 | |
| | | | | | | | | | | | | inheritable has been changed to class_attribute. class inheritable attributes has been deprecated. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Bring back "Reject attributes even if association is loaded" after rebasing ↵ | Emilio Tagua | 2010-11-19 | 1 | -3/+10 | |
| | | | | | | | | to master. | |||||
* | | Reeject attributes even if association is loaded | Marcin Raczkowski | 2010-11-19 | 1 | -1/+0 | |
|/ | ||||||
* | present? is better here | Santiago Pastorino | 2010-11-11 | 1 | -1/+1 | |
| | ||||||
* | Use ! instead of not | Santiago Pastorino | 2010-11-11 | 1 | -1/+1 | |
| | ||||||
* | Fixed bug in active_record/nested_attributes where an empty string id caused ↵ | Santiago Pastorino | 2010-11-11 | 1 | -1/+1 | |
| | | | | | | | | an ActiveRecord::RecordNotFound error. Found by [Ben Tillman] [#5638 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Revert 0c0b0aa0f223523331afdc157fb3992a121bf497 which introduced a security ↵ | Michael Koziarski | 2010-10-15 | 1 | -9/+8 | |
| | | | | | | | | | | vulnerability. This addresses CVE-2010-3933 Conflicts: activerecord/lib/active_record/nested_attributes.rb | |||||
* | Fix for nested_attributes with has_many association fails when a single ↵ | Neeraj Singh | 2010-09-27 | 1 | -1/+6 | |
| | | | | | | | | record is being updated. [#5705 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | reject_id option should be respected while using nested_attributes | Neeraj Singh | 2010-09-24 | 1 | -3/+3 | |
| | | | | | | [#5579 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | switch present in favor of empty | Aaron Patterson | 2010-09-22 | 1 | -1/+1 | |
| | ||||||
* | Note about validates_presence_of and nested attributes | Trevor Turk | 2010-08-19 | 1 | -0/+16 | |
| | ||||||
* | Note about using attr_accessible with nested attributes | Trevor Turk | 2010-08-19 | 1 | -0/+12 | |
| | ||||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -1/+1 | |
| | | | | 's/[ \t]*$//' -i {} \;) | |||||
* | edit pass to apply API guideline wrt the use of "# =>" in example code | Xavier Noria | 2010-07-30 | 1 | -2/+2 | |
| | ||||||
* | accepts_nested_attributes_for typo | Adam Meehan | 2010-06-29 | 1 | -1/+1 | |
| | ||||||
* | Fixes #2415 by creating a new instance of the Model when saving attributes ↵ | George Montana Harkin | 2010-06-27 | 1 | -8/+11 | |
| | | | | | | to that model and the associated attributes already exist. Tests included. [#2415 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Missing quote and indentation wrong | Malcolm Locke | 2010-06-17 | 1 | -2/+2 | |
| | ||||||
* | Adds title and minor changes. | Rizwan Reza | 2010-06-16 | 1 | -1/+2 | |
| | ||||||
* | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -1/+1 | |
| | ||||||
* | Use primary key in conditions, not 'id' [#4395 state:resolved] | Mathieu Arnold | 2010-05-04 | 1 | -1/+1 | |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Some require indifferent_access added | Santiago Pastorino | 2010-04-21 | 1 | -0/+1 | |
| | | | | Signed-off-by: Xavier Noria <fxn@ubuntu.(none)> | |||||
* | Ensure not to load the entire association when bulk updating existing ↵ | Pratik Naik | 2010-04-14 | 1 | -2/+12 | |
| | | | | records using nested attributes | |||||
* | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+1 | |
| | ||||||
* | cleaning up a bunch of method already defined warnings [#4209 state:resolved] | Aaron Patterson | 2010-03-17 | 1 | -0/+3 | |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | |||||
* | clean up more warnings, remove unnecessary methods, fix eval line numbers. ↵ | Aaron Patterson | 2010-03-16 | 1 | -2/+2 | |
| | | | | | | [#4193 state:resolved] Signed-off-by: wycats <wycats@gmail.com> | |||||
* | Merge docrails | Pratik Naik | 2010-01-17 | 1 | -5/+5 | |
| | ||||||
* | Renamed AssociationReflection #collection_association? to #collection?. | Eloy Duran | 2010-01-08 | 1 | -1/+1 | |
| | ||||||
* | Raise a RecordNotFound if an ID in nested attributes is given but doesn't ↵ | Eloy Duran | 2010-01-07 | 1 | -0/+11 | |
| | | | | return a record. [#2415 state:resolved] | |||||
* | Remove deprecated '_delete' option from NestedAttributes. | Eloy Duran | 2010-01-07 | 1 | -13/+2 | |
| | ||||||
* | Removed unnecessary call to #try and cleaned up a bit more. | Eloy Duran | 2010-01-07 | 1 | -6/+4 | |
| | ||||||
* | Cleanup some code in nested_attributes.rb, autosave_association.rb, and ↵ | Eloy Duran | 2010-01-07 | 1 | -7/+1 | |
| | | | | | | associations.rb with AssociationReflection#collection_association? Also cache the result value. | |||||
* | Refactored nested attributes a bit around :reject_if => :all_blank. | Eloy Duran | 2010-01-07 | 1 | -5/+4 | |
| | ||||||
* | Refactored previous changes to nested attributes. | Eloy Duran | 2009-12-28 | 1 | -32/+18 | |
| | ||||||
* | Add an :update_only option to accepts_nested_attributes_for for to-one ↵ | Michael Siebert | 2009-12-28 | 1 | -3/+23 | |
| | | | | | | associations. [#2563 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | |||||
* | Make sure to not add autosave callbacks multiple times. [#3575 state:resolved] | Eloy Duran | 2009-12-28 | 1 | -3/+1 | |
| | | | | This makes sure that, in a HABTM association, only one join record is craeted. | |||||
* | Define autosave association callbacks when using accepts_nested_attributes_for. | Eloy Duran | 2009-11-07 | 1 | -0/+2 | |
| | | | | | | | This way we don't define all the validation methods for all associations by default, but only when needed. [#3355 state:resolved] | |||||
* | Add a :limit option to specify the maximum number of records that can be ↵ | Pratik Naik | 2009-10-09 | 1 | -1/+14 | |
| | | | | processed by accepts_nested_attributes_for | |||||
* | Store entire options hash in the class var rather than just the reject_if ↵ | Pratik Naik | 2009-10-09 | 1 | -12/+15 | |
| | | | | proc for the nested attributes | |||||
* | Use indifferent access attributes instead of stringifying them | Pratik Naik | 2009-10-08 | 1 | -2/+2 | |
| | ||||||
* | Allow accepts_nested_attributes_for :reject_if option accept symbols for ↵ | Pratik Naik | 2009-10-07 | 1 | -6/+33 | |
| | | | | | | | | using a method Conflicts: activerecord/lib/active_record/nested_attributes.rb | |||||
* | Rename nested attributes _delete to _destroy to reflect its actual behavior ↵ | José Valim | 2009-09-12 | 1 | -21/+32 | |
| | | | | | | and DSL (:allow_destroy). Deprecation warning added. [#2889 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | |||||
* | Raise an exception with friendlier error message when attempting to build a ↵ | Mike Breen | 2009-09-12 | 1 | -1/+6 | |
| | | | | | | polymorphic belongs_to with accepts_nested_attributes_for. [#2318 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | |||||
* | Merge docrails | Pratik Naik | 2009-07-25 | 1 | -1/+1 | |
| |