dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

ensure that pet state is saved before trying to save its assets

Browse source
This commit is contained in:
Emi Matchu 2012-01-13 15:56:31 -06:00
parent 171d691a98
commit ec3088fdec
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/item.rb
View file

@ -284,9 +284,9 @@ class Item < ActiveRecord::Base
swf_asset_ids << asset_id.to_i if asset_data
end
existing_swf_assets = SwfAsset.object_assets.find_all_by_remote_id swf_asset_ids
existing_swf_assets_by_id = {}
existing_swf_assets_by_remote_id = {}
existing_swf_assets.each do |swf_asset|
existing_swf_assets_by_id[swf_asset.remote_id] = swf_asset
existing_swf_assets_by_remote_id[swf_asset.remote_id] = swf_asset
end
# With each asset in the registry,
@ -306,11 +306,11 @@ class Item < ActiveRecord::Base
item.current_body_id = pet_type.body_id
# Build and update the SWF
swf_asset_id = asset_data[:asset_id].to_i
swf_asset = existing_swf_assets_by_id[swf_asset_id]
swf_asset_remote_id = asset_data[:asset_id].to_i
swf_asset = existing_swf_assets_by_remote_id[swf_asset_remote_id]
unless swf_asset
swf_asset = SwfAsset.new
swf_asset.remote_id = swf_asset_id
swf_asset.remote_id = swf_asset_remote_id
end
swf_asset.origin_object_data = asset_data
swf_asset.origin_pet_type = pet_type
@ -320,7 +320,6 @@ class Item < ActiveRecord::Base
unless relationship
relationship = ParentSwfAssetRelationship.new
relationship.parent = item
relationship.swf_asset_id = swf_asset.id
end
relationship.swf_asset = swf_asset
relationships_by_item_id[item_id] ||= []

4
app/models/pet.rb
View file

@ -66,14 +66,14 @@ class Pet < ActiveRecord::Base
before_validation do
pet_type.save!
if @pet_state
@pet_state.handle_assets!
@pet_state.save!
@pet_state.handle_assets!
end
if @items
@items.each do |item|
item.handle_assets!
item.save!
item.handle_assets!
end
end
end