From e43fb6fc5a7544db177768234132cef29eba22d2 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Fri, 7 Mar 2014 17:34:47 -0500 Subject: Made the tournaments defaults back to reasonable and permissions 'work' --- app/controllers/tournaments_controller.rb | 3 ++- app/models/user.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 0807953..d2a2d18 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -22,7 +22,8 @@ class TournamentsController < ApplicationController def new @games = Game.all @tournament = Tournament.new(game: Game.find_by_id(params[:game])) - @tournament.status = 1 + @tournament.status = 0 + @tournament.save end # GET /tournaments/1/edit diff --git a/app/models/user.rb b/app/models/user.rb index 70e7f25..6e439fb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -19,7 +19,7 @@ class User < ActiveRecord::Base when :admin return ((groups & 2) != 0) when :host - return ((groups & 1) != 0) + return true #((groups & 1) != 0) when :player return true when :specator -- cgit v1.2.3-2-g168b From 5fe8ef2c4f33480766a477a27dcdfed6b6a26137 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Fri, 7 Mar 2014 17:52:01 -0500 Subject: Added chess. --- db/seeds.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 5567a30..06b46a6 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,6 +6,7 @@ # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) # Mayor.create(name: 'Emanuel', city: cities.first) # -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: false) - +Game.create(name: "League of Legends",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) +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) +#User.create(id: 1, name: "Andrew", email: "amurrel@example.com", user_name: "ImFromNASA", created_at: "2014-03-07 22:48:53", updated_at: "2014-03-07 22:48:53", password_digest: "$2a$10$W0FwPRDzdQp8arolCHGt5ezXqkOiTLNsXI5GKGtu9qr3...", remember_token: "1583722b02663e024533296171cad79f29037ebc", groups: 0) -- cgit v1.2.3-2-g168b