diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 12:50:56 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 12:50:56 -0800 |
| commit | 9fe42232f14eb44f06c655e87b54ff30cee0fe44 (patch) | |
| tree | 2a9fa606752099a0f1cc9a27f77d08d9a0a634a0 /activerecord/test/models/ship.rb | |
| parent | a76af2309ac362ae1f38d24fd4746139deca3417 (diff) | |
| parent | c23fbd0d475612fe9cd493bd08c8da2f8d7e6f03 (diff) | |
| download | rails-9fe42232f14eb44f06c655e87b54ff30cee0fe44.tar.gz rails-9fe42232f14eb44f06c655e87b54ff30cee0fe44.tar.bz2 rails-9fe42232f14eb44f06c655e87b54ff30cee0fe44.zip | |
Merge commit 'Fingertips/master'
Diffstat (limited to 'activerecord/test/models/ship.rb')
| -rw-r--r-- | activerecord/test/models/ship.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/models/ship.rb b/activerecord/test/models/ship.rb index 06759d64b8..a96e38ab41 100644 --- a/activerecord/test/models/ship.rb +++ b/activerecord/test/models/ship.rb @@ -2,9 +2,11 @@ class Ship < ActiveRecord::Base self.record_timestamps = false belongs_to :pirate + belongs_to :update_only_pirate, :class_name => 'Pirate' has_many :parts, :class_name => 'ShipPart', :autosave => true accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } + accepts_nested_attributes_for :update_only_pirate, :update_only => true validates_presence_of :name end |