diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:29:20 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:29:20 -0500 |
| commit | 7e7a0a4a0465142612acd1e0d050cb1b91f93d90 (patch) | |
| tree | 164c4ca2e0b54e9b6665cb981f7e46a2ac159999 | |
| parent | 7243bc441795b70249d99bd43a4a0a88c042f91f (diff) | |
| parent | 5f7189c2fe6f39b2056d5f3a6d91e557306697da (diff) | |
no conflicts:
Merge branch 'master' of https://github.com/LukeShu/leaguer
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/views/matches/show.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 6e439fb..70e7f25 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 true #((groups & 1) != 0) + return ((groups & 1) != 0) when :player return true when :specator diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 3a7e7a6..b6930ea 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -12,7 +12,7 @@ <%= form_for([@tournament, @match], method: "put") do |f| %> <ul> <% @match.teams.each do |team| %> - <li><label><%= f.radio_button(:winner_id, team.id) %> + <li><label><%= f.radio_button(:winner, team.id) %> <%= team.users.collect{|u| u.user_name}.join(", ") %></label></li> <% end %> </ul> |