Merge branch 'master' of https://github.com/LukeShu/leaguer

32 files changed, 22 insertions, 16 deletions

diff --git a/db/migrate/20140424190540_create_simple_captcha_data.rb b/db/migrate/20140426201409_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140424190540_create_simple_captcha_data.rb
+++ b/db/migrate/20140426201409_create_simple_captcha_data.rb
diff --git a/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb
index 690cec2..690cec2 100644
--- a/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb
+++ b/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb
diff --git a/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb b/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb
index 7f41ac6..7f41ac6 100644
--- a/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb
+++ b/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb
diff --git a/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb b/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb
index 04c12ef..04c12ef 100644
--- a/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb
+++ b/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb
diff --git a/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb b/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb
index b8d6588..b8d6588 100644
--- a/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb
+++ b/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb
diff --git a/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb
index 9ce904f..9ce904f 100644
--- a/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb
+++ b/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb
diff --git a/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb
index 60f67ab..60f67ab 100644
--- a/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb
+++ b/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb
diff --git a/db/migrate/20140424230543_create_delayed_jobs.rb b/db/migrate/20140427001413_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140424230543_create_delayed_jobs.rb
+++ b/db/migrate/20140427001413_create_delayed_jobs.rb
diff --git a/db/migrate/20140424230547_create_servers.rb b/db/migrate/20140427001416_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140424230547_create_servers.rb
+++ b/db/migrate/20140427001416_create_servers.rb
diff --git a/db/migrate/20140424230550_create_matches.rb b/db/migrate/20140427001420_create_matches.rb
index bac92d1..bac92d1 100644
--- a/db/migrate/20140424230550_create_matches.rb
+++ b/db/migrate/20140427001420_create_matches.rb
diff --git a/db/migrate/20140424230554_create_teams.rb b/db/migrate/20140427001424_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140424230554_create_teams.rb
+++ b/db/migrate/20140427001424_create_teams.rb
diff --git a/db/migrate/20140424230558_create_alerts.rb b/db/migrate/20140427001428_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140424230558_create_alerts.rb
+++ b/db/migrate/20140427001428_create_alerts.rb
diff --git a/db/migrate/20140424230602_create_pms.rb b/db/migrate/20140427001431_create_pms.rb
index eb9f443..eb9f443 100644
--- a/db/migrate/20140424230602_create_pms.rb
+++ b/db/migrate/20140427001431_create_pms.rb
diff --git a/db/migrate/20140424230605_create_tournaments.rb b/db/migrate/20140427001435_create_tournaments.rb
index 716871f..03b42b2 100644
--- a/db/migrate/20140424230605_create_tournaments.rb
+++ b/db/migrate/20140427001435_create_tournaments.rb
@@ -11,6 +11,7 @@ class CreateTournaments < ActiveRecord::Migration
       t.integer :set_rounds
       t.boolean :randomized_teams
       t.string :sampling_method
+      t.string :scoring_method
 
       t.timestamps
     end
diff --git a/db/migrate/20140424230609_create_games.rb b/db/migrate/20140427001439_create_games.rb
index 23edf0b..fe2e596 100644
--- a/db/migrate/20140424230609_create_games.rb
+++ b/db/migrate/20140427001439_create_games.rb
@@ -10,6 +10,7 @@ class CreateGames < ActiveRecord::Migration
       t.integer :set_rounds
       t.boolean :randomized_teams
       t.string :sampling_method
+      t.string :scoring_method
 
       t.timestamps
     end
diff --git a/db/migrate/20140424230613_create_users.rb b/db/migrate/20140427001443_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140424230613_create_users.rb
+++ b/db/migrate/20140427001443_create_users.rb
diff --git a/db/migrate/20140424230617_create_sessions.rb b/db/migrate/20140427001446_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140424230617_create_sessions.rb
+++ b/db/migrate/20140427001446_create_sessions.rb
diff --git a/db/migrate/20140424230620_create_brackets.rb b/db/migrate/20140427001450_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140424230620_create_brackets.rb
+++ b/db/migrate/20140427001450_create_brackets.rb
diff --git a/db/migrate/20140424230624_create_game_settings.rb b/db/migrate/20140427001454_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140424230624_create_game_settings.rb
+++ b/db/migrate/20140427001454_create_game_settings.rb
diff --git a/db/migrate/20140424230628_create_tournament_settings.rb b/db/migrate/20140427001458_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140424230628_create_tournament_settings.rb
+++ b/db/migrate/20140427001458_create_tournament_settings.rb
diff --git a/db/migrate/20140424230632_create_tournament_stages.rb b/db/migrate/20140427001502_create_tournament_stages.rb
index e3668cb..6e52bf0 100644
--- a/db/migrate/20140424230632_create_tournament_stages.rb
+++ b/db/migrate/20140427001502_create_tournament_stages.rb
@@ -2,8 +2,9 @@ class CreateTournamentStages < ActiveRecord::Migration
   def change
     create_table :tournament_stages do |t|
       t.references :tournament, index: true
-      t.string :scheduling
       t.text :structure
+      t.string :scheduling_method
+      t.string :seeding_method
 
       t.timestamps
     end
diff --git a/db/migrate/20140424230635_create_statistics.rb b/db/migrate/20140427001505_create_statistics.rb
index cc2e97d..cc2e97d 100644
--- a/db/migrate/20140424230635_create_statistics.rb
+++ b/db/migrate/20140427001505_create_statistics.rb
diff --git a/db/migrate/20140424230639_create_remote_usernames.rb b/db/migrate/20140427001509_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140424230639_create_remote_usernames.rb
+++ b/db/migrate/20140427001509_create_remote_usernames.rb
diff --git a/db/migrate/20140424230643_create_bracket_matches.rb b/db/migrate/20140427001513_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140424230643_create_bracket_matches.rb
+++ b/db/migrate/20140427001513_create_bracket_matches.rb
diff --git a/db/migrate/20140424230646_create_api_requests.rb b/db/migrate/20140427001516_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140424230646_create_api_requests.rb
+++ b/db/migrate/20140427001516_create_api_requests.rb
diff --git a/db/migrate/20140424230650_create_tournament_players_join_table.rb b/db/migrate/20140427001520_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140424230650_create_tournament_players_join_table.rb
+++ b/db/migrate/20140427001520_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140424230654_create_tournament_hosts_join_table.rb b/db/migrate/20140427001523_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140424230654_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140427001523_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140424230657_create_team_user_join_table.rb b/db/migrate/20140427001527_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140424230657_create_team_user_join_table.rb
+++ b/db/migrate/20140427001527_create_team_user_join_table.rb
diff --git a/db/migrate/20140424230701_create_match_team_join_table.rb b/db/migrate/20140427001531_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140424230701_create_match_team_join_table.rb
+++ b/db/migrate/20140427001531_create_match_team_join_table.rb
diff --git a/db/migrate/20140424230712_add_hidden_attrs_to_user.rb b/db/migrate/20140427001542_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140424230712_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140427001542_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index d7e4efd..0616ef2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140424230712) do
+ActiveRecord::Schema.define(version: 20140427001542) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -97,6 +97,7 @@ ActiveRecord::Schema.define(version: 20140424230712) do
     t.integer  "set_rounds"
     t.boolean  "randomized_teams"
     t.string   "sampling_method"
+    t.string   "scoring_method"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -254,8 +255,9 @@ ActiveRecord::Schema.define(version: 20140424230712) do
 
   create_table "tournament_stages", force: true do |t|
     t.integer  "tournament_id"
-    t.string   "scheduling"
     t.text     "structure"
+    t.string   "scheduling_method"
+    t.string   "seeding_method"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -273,6 +275,7 @@ ActiveRecord::Schema.define(version: 20140424230712) do
     t.integer  "set_rounds"
     t.boolean  "randomized_teams"
     t.string   "sampling_method"
+    t.string   "scoring_method"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
diff --git a/db/seeds.rb b/db/seeds.rb
index 87bf540..3b98070 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -7,7 +7,7 @@
 #   Mayor.create(name: 'Emanuel', city: cities.first)
 #
 p = User.permission_bits
-Server.create(default_user_permissions: p[:join_tournament] | p[:create_pm])
+Server.create(default_user_permissions: p[:join_tournament] | p[:create_pm] | p[:create_bracket] | p[:edit_bracket])
 
 Game.create(name: "League of Legends",min_players_per_team: 5,  max_players_per_team: 5, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true, sampling_method: "Manual,Double Blind,RiotAPI")
 Game.create(name: "Chess", min_players_per_team: 1,  max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true, sampling_method: "Manual,Double Blind")
@@ -16,26 +16,26 @@ Game.create(name: "Rock, Paper, Scissors", min_players_per_team: 1, max_players_
 
 Game.find_by_name("League of Legends").settings.create(name: "Map", default: "Summoners Rift", type_opt: "Summoners Rift,Twisted Treeline,Crystal Scar,Haunted Abyss", description: "Select a map to play on.", vartype: 5, display_order: 1)
 Game.find_by_name("League of Legends").settings.create(name: "Pick Type", type_opt: "Blind Pick,Draft", description: "Select a pick type.", vartype: 5, display_order: 2)
-Game.find_by_name("League of Legends").settings.create(name: "Scoring Method", type_opt: "FibonacciPeerWithBlowout,MarginalPeer,WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 3)
-Game.find_by_name("League of Legends").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 4)
-Game.find_by_name("League of Legends").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 5)
+#Game.find_by_name("League of Legends").settings.create(name: "Scoring Method", type_opt: "FibonacciPeerWithBlowout,MarginalPeer,WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 3)
+#Game.find_by_name("League of Legends").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 4)
+#Game.find_by_name("League of Legends").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 5)
 
 Game.find_by_name("Chess").settings.create(name: "Time Control", description: "Enter a value for Time Control (ie. 5-5, 30, 6hr, or None)", vartype: 0, display_order: 1)
-Game.find_by_name("Chess").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 2)
-Game.find_by_name("Chess").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 3)
-Game.find_by_name("Chess").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 4)
+#Game.find_by_name("Chess").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 2)
+#Game.find_by_name("Chess").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 3)
+#Game.find_by_name("Chess").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 4)
 
 Game.find_by_name("Hearthstone").settings.create(name: "Deck Name", description: "Enter a name for your deck, be descriptive.", vartype: 1, display_order: 1)
-Game.find_by_name("Hearthstone").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 2)
-Game.find_by_name("Hearthstone").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 3)
-Game.find_by_name("Hearthstone").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 4)
+#Game.find_by_name("Hearthstone").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 2)
+#Game.find_by_name("Hearthstone").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 3)
+#Game.find_by_name("Hearthstone").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 4)
 
 Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Favorite Object", description: "What is your favorite object in RPS?", type_opt: "Rock,Paper,Scissors", vartype: 2, display_order: 5)
 Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Lizard, Spock allowed?", description: "Will you allow Lizard and Spock?", vartype: 4, display_order: 4)
 Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Why are those up there even called radio buttons?", description: "Check boxes make sense at least", type_opt: "I do not know.,There is now spoon.,Wow.,Because electricity.,Wat?", vartype: 3, display_order: 6)
-Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 1)
-Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 2)
-Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 3)
+#Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 1)
+#Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 2)
+#Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 3)
 
 if Rails.env.development?
 	#user 1, the ADMIN