Fix sit stanđ seat player logic
This commit is contained in:
parent
fba063cf4f
commit
8d75df244d
@ -12,9 +12,17 @@ class Seat < ActiveRecord::Base
|
|||||||
current_user.stand_from(self.table)
|
current_user.stand_from(self.table)
|
||||||
|
|
||||||
self.reload
|
self.reload
|
||||||
self.player_id = self.table.current_game.add_player_from_user(current_user).id
|
if self.player == nil
|
||||||
|
self.player_id = self.table.current_game.add_player_from_user(current_user).id
|
||||||
|
end
|
||||||
|
|
||||||
|
self.player.user_id = current_user.id
|
||||||
|
self.player.soft_token = current_user.soft_token
|
||||||
|
self.player.save
|
||||||
|
|
||||||
self.user_id = current_user.id
|
self.user_id = current_user.id
|
||||||
self.user_soft_token = current_user.soft_token
|
self.user_soft_token = current_user.soft_token
|
||||||
|
|
||||||
return self.save
|
return self.save
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -23,10 +31,13 @@ class Seat < ActiveRecord::Base
|
|||||||
unless self.occupied_by?(user)
|
unless self.occupied_by?(user)
|
||||||
return "Error. Seat not occupied by you."
|
return "Error. Seat not occupied by you."
|
||||||
else
|
else
|
||||||
self.table.current_game.remove_player_from_user(user)
|
# self.table.current_game.remove_player_from_user(user)
|
||||||
|
self.player.user = nil
|
||||||
|
self.player.soft_token = nil
|
||||||
|
self.player.save
|
||||||
self.user_id = nil
|
self.user_id = nil
|
||||||
self.user_soft_token = nil
|
self.user_soft_token = nil
|
||||||
self.player_id = nil
|
# self.player_id = nil
|
||||||
self.save
|
self.save
|
||||||
return "Successfully stood up."
|
return "Successfully stood up."
|
||||||
end
|
end
|
||||||
|
|||||||
@ -33,11 +33,7 @@ class User < ActiveRecord::Base
|
|||||||
@seats << table.seats.where(user_soft_token: self.soft_token)
|
@seats << table.seats.where(user_soft_token: self.soft_token)
|
||||||
end
|
end
|
||||||
@seats.flatten.each do |seat|
|
@seats.flatten.each do |seat|
|
||||||
seat.try(:player).try(:destroy)
|
seat.stand(self)
|
||||||
seat.user_id = nil
|
|
||||||
seat.player_id = nil
|
|
||||||
seat.user_soft_token = nil
|
|
||||||
seat.save
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user