diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-07 17:34:47 -0500 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-07 17:34:47 -0500 |
| commit | e43fb6fc5a7544db177768234132cef29eba22d2 (patch) | |
| tree | b3d67b66dd4c21d2ee1b8f4874f6e7a217fd3105 | |
| parent | 5f7189c2fe6f39b2056d5f3a6d91e557306697da (diff) | |
Made the tournaments defaults back to reasonable and permissions 'work'
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 3 | ||||
| -rw-r--r-- | 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 |