From d90e7d47ed0900f2f8df62dba2e463752e0e3e81 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 23 Apr 2014 21:25:37 -0400 Subject: save before setting settings --- app/models/tournament.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/models') diff --git a/app/models/tournament.rb b/app/models/tournament.rb index e21ccb1..686e066 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -40,6 +40,7 @@ class Tournament < ActiveRecord::Base end def []=(setting_name, val) + @tournament.save tournament_setting = @tournament.settings_raw.find_by_name(setting_name) if tournament_setting.nil? game_setting = @tournament.game.settings.find_by_name(setting_name) -- cgit v1.2.3-2-g168b From d1dbfb1dcd4810f538826fa5e448bdda0998b38e Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 21:33:49 -0400 Subject: run ./generate.sh --- app/models/game_setting.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/models') diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb index bff8d97..e6d43e5 100644 --- a/app/models/game_setting.rb +++ b/app/models/game_setting.rb @@ -1,3 +1,4 @@ class GameSetting < ActiveRecord::Base belongs_to :game + belongs_to :parent end -- cgit v1.2.3-2-g168b From cfa41fcc58acc9ae50b84eb51e3d9fa9ecb3b79e Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 21:45:40 -0400 Subject: run ./generate.sh --- app/models/game.rb | 1 + app/models/game_setting.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/game.rb b/app/models/game.rb index a181c26..13520ac 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -1,2 +1,3 @@ class Game < ActiveRecord::Base + belongs_to :parent end diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb index e6d43e5..bff8d97 100644 --- a/app/models/game_setting.rb +++ b/app/models/game_setting.rb @@ -1,4 +1,3 @@ class GameSetting < ActiveRecord::Base belongs_to :game - belongs_to :parent end -- cgit v1.2.3-2-g168b From 47be7c86ca5193ffe4331fbb9358a9171abe748b Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 22:28:27 -0400 Subject: Luke made the remote_username stuff work --- app/models/remote_username.rb | 6 +++++- app/models/user.rb | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'app/models') diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb index c2c3d20..8c1ce26 100644 --- a/app/models/remote_username.rb +++ b/app/models/remote_username.rb @@ -3,7 +3,11 @@ class RemoteUsername < ActiveRecord::Base belongs_to :user def value - JSON.parse(self.json_value) + begin + return JSON.parse(self.json_value) + rescue + return {} + end end def value=(v) diff --git a/app/models/user.rb b/app/models/user.rb index 138f73e..5c0b5b1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -24,9 +24,13 @@ class User < ActiveRecord::Base end def find_remote_username(game) - obj = remote_username.where(:game => game) - if obj.nil? and not game.parent.nil? - return find_remote_username(game.parent) + obj = self.remote_usernames.where(:game => game).first + if obj.nil? + if game.parent.nil? + return nil + else + return find_remote_username(game.parent) + end else return obj.value end -- cgit v1.2.3-2-g168b