From 493c2528076076beae43b2574493ed3955c38f4b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 21 Apr 2014 09:59:40 -0400
Subject: run ./generate.sh

---
 app/models/api_requests.rb          | 2 ++
 app/models/tournament_preference.rb | 3 ---
 app/models/tournament_setting.rb    | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 app/models/api_requests.rb
 delete mode 100644 app/models/tournament_preference.rb
 create mode 100644 app/models/tournament_setting.rb

(limited to 'app')

diff --git a/app/models/api_requests.rb b/app/models/api_requests.rb
new file mode 100644
index 0000000..19c76e2
--- /dev/null
+++ b/app/models/api_requests.rb
@@ -0,0 +1,2 @@
+class ApiRequests < ActiveRecord::Base
+end
diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb
deleted file mode 100644
index 3d15061..0000000
--- a/app/models/tournament_preference.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class TournamentPreference < ActiveRecord::Base
-	belongs_to :tournament
-end
diff --git a/app/models/tournament_setting.rb b/app/models/tournament_setting.rb
new file mode 100644
index 0000000..b3e6ace
--- /dev/null
+++ b/app/models/tournament_setting.rb
@@ -0,0 +1,3 @@
+class TournamentSetting < ActiveRecord::Base
+	belongs_to :tournament
+end
-- 
cgit v1.2.3-2-g168b


From c3d46241a2298ecec052332c1767a65b010cf9a1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 21 Apr 2014 10:33:46 -0400
Subject: run ./generate.sh

---
 app/models/server_setting.rb | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 app/models/server_setting.rb

(limited to 'app')

diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb
deleted file mode 100644
index 28ae943..0000000
--- a/app/models/server_setting.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class ServerSetting < ActiveRecord::Base
-end
-- 
cgit v1.2.3-2-g168b


From d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 21 Apr 2014 21:46:24 -0400
Subject: re-jigger Tournament::Setting

---
 app/models/tournament.rb | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

(limited to 'app')

diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index bf44cdf..73c8d93 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -38,36 +38,26 @@ class Tournament < ActiveRecord::Base
 			@tournament = tournament
 		end
 
-		def [](setting)
-			p = @tournament.settings_raw.find_by_name(setting)
-			if p.nil?
+		def [](setting_name)
+			tournament_setting = @tournament.settings_raw.find_by_name(setting_name)
+			if tournament_setting.nil?
 				return nil
 			else
-				return p.value
+				return tournament_setting.value
 			end
 		end
 
-		def []=(setting, val)
-			p = @tournament.settings_raw.find_by_name(setting)
-			if p.nil?
-				TournamentSetting.create( tournament_id: @tournament.id, vartype: get_type(val), name: setting, value: val )
+		def []=(setting_name, val)
+			tournament_setting = @tournament.settings_raw.find_by_name(setting_name)
+			if tournament_setting.nil?
+				game_setting = @tournament.game.settings.find_by_name(setting_name)
+				@tournament.settings_raw.create(name: setting, value: val,
+					vartype: game_setting.vartype,
+					type_opt: game_setting.type_opt,
+					description: game_setting.description,
+					display_order: game_setting.display_order)
 			else
-				p.value = val
-			end
-		end
-
-		def get_type(val)
-			case val
-				when "true", "false"
-					vartypes[:true_false]
-				when /\d+-\d/ =~ val
-					vartypes[:range]
-				when /\d+/ =~ val
-					vartypes[:integer]
-				when /,/ =~ val
-					vartypes[:select]
-				else
-					vartypes[:string]
+				tournament_setting.value = val
 			end
 		end
 
-- 
cgit v1.2.3-2-g168b