Fix models and views related to matches/contets

app/controllers/matches_controller.rb

@@ -48,6 +48,7 @@ class MatchesController < ApplicationController
 
   def update
     raise AccessError unless @match.can_update? cuser, params[:match]
+    # FIXME: better implementation
     if params[:match][:matchers_attributes]
       params[:match][:matchers_attributes].each do |key, matcher|
         matcher["_destroy"] = matcher["_destroy"] == "keep" ? false : true

app/models/match.rb

@@ -59,6 +59,8 @@ class Match < ActiveRecord::Base
   has_many :users, :through => :matchers
   has_many :predictions, :dependent => :destroy
   has_many :comments, -> { order("created_at") }, :as => :commentable, :dependent => :destroy
+  has_many :match_proposals, inverse_of: :match, dependent: :destroy
+  
   belongs_to :challenge
   belongs_to :contest
   belongs_to :contester1, -> { includes('team') }, :class_name => "Contester"

app/views/contests/edit.html.erb

@@ -244,7 +244,7 @@
                         <%= namelink match.contester2.team %>
                     </td>
                     <td>
-                        <%= longtime match.match_time %>
+                        <%= link_to (longtime match.match_time), match %>
                     </td>
                     <td>
                         <% link_to match do %>

app/views/matches/_form.html.erb

@@ -25,7 +25,7 @@
     </div>
     <div class="fields horizontal">
       <%= f.label :referee_id %>
-      <%= f.select :referee_id, Group.find(Group::REFEREES).users.collect{|u| [u, u.id]}, {:include_blank => true} %>
+      <%= f.select :referee_id, Group.referees.collect{|u| [u, u.id]}, {:include_blank => true} %>
     </div>
     <div class="fields horizontal">
       <%= f.label :week_id %>

app/views/matches/_lineup.html.erb

@@ -1,7 +1,7 @@
 <div class="players">
   <% contester.lineup.each do |teamer| %>
     <div class="player fields">
-      <% if matcher = @match.matchers.first(conditions: { user_id: teamer.user_id, contester_id: contester.id }) %>
+      <% if matcher = @match.matchers.where(user_id: teamer.user_id, contester_id: contester.id).first %>
         <%= hidden_field_tag "match[matchers_attributes][#{@n}][id]", matcher.id %>
       <% end %>
 

app/views/matches/_list.html.erb

@@ -11,7 +11,7 @@
       <th class="maps">Maps</th>
     <% end %>
     <th class="score">Score</th>
-    <% if matches&.first.contest.contest_type == Contest::TYPE_LADDER %>
+    <% if matches.first&.contest&.contest_type == Contest::TYPE_LADDER %>
       <th class="points">Points</th>
     <% end %>
   </tr>

app/views/matches/show.html.erb

@@ -124,7 +124,7 @@
 
   <% if cuser and @match.can_update? cuser, [:report] %>
     <div class="referee">
-      <%= link_to "Referee Admin", match_ref_path(@match), class: 'button' %>
+      <%= link_to "Referee Admin", ref_match_path(@match), class: 'button' %>
     </div>
   <% end %>
   <% if cuser and @match.referee.nil? and cuser.ref? %>