OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

fix silly closet hanger merge bug involving flex

Browse source
This commit is contained in:
Emi Matchu 2013-07-28 23:30:29 -07:00
parent 082119afe1
commit e48d00294d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/closet_hanger.rb
View file

@ -116,8 +116,9 @@ class ClosetHanger < ActiveRecord::Base
def merge_quantities def merge_quantities
# Find a hanger that conflicts: for the same item, in the same user's # Find a hanger that conflicts: for the same item, in the same user's
# closet, same owned status, same list. It also must not be the current # closet, same owned status, same list. It also must not be the current
# hanger. # hanger. Select enough for our logic and to update flex_source.
conflicting_hanger = self.class.select([:id, :quantity]). conflicting_hanger = self.class.select([:id, :quantity, :user_id, :item_id,
:owned]).
where(:user_id => user_id, :item_id => item_id, :owned => owned, where(:user_id => user_id, :item_id => item_id, :owned => owned,
:list_id => list_id).where(['id != ?', self.id]).first :list_id => list_id).where(['id != ?', self.id]).first