Removed upcomingMatches because matches are an A-R relation of Tournament

app/controllers/static_pages_controller.rb

@@ -8,10 +8,9 @@ class StaticPagesController < ApplicationController
 	      @tournament = Tournament.find(params[:tournament])
 		end
 	    if @tournament
-				if @tournament.matches.empty?
+				@matches = @tournament.matches
+				if @matches.empty?
 					redirect_to "/static_pages/noMatches?tournament=#{@tournament.id}"
-				else
-	    		@matches = @tournament.upcomingMatches
 				end
 	    end
 	end
@@ -30,12 +29,12 @@ class StaticPagesController < ApplicationController
 		if params[:tournament]
 	      @tournament = Tournament.find(params[:tournament])
 		end
-	    if @tournament
+    if @tournament
-	    	@matches = Match.where(tournament_id: @tournament.id)
+    	@matches = @tournament.matches
-	    end
+    end
 		@matches = @matches.where(finished: 1)
-
 	end
+
 	def brackets
 	    if params[:weight]
 	    	@weight = Weight.find(params[:weight])
@@ -50,7 +49,7 @@ class StaticPagesController < ApplicationController
 				end
 	    end
 	end
-	
+
 	def all_brackets
 	    if params[:tournament]
 	    	@tournament = Tournament.find(params[:tournament])
@@ -85,7 +84,7 @@ class StaticPagesController < ApplicationController
 			@tournament = Tournament.find(params[:tournament])
 		end
 	end
-	
+
 	def generate_matches
 		if !user_signed_in?
 	      redirect_to root_path

app/models/tournament.rb

@@ -24,10 +24,6 @@ class Tournament < ActiveRecord::Base
 		end
 	end
 
-	def upcomingMatches
-			matches
-	end
-
 	def destroyAllMatches
 		matches.destroy_all
 	end

app/views/static_pages/all_brackets.html.erb

@@ -1,5 +1,5 @@
 <style>
-.pagebreak { page-break-after: always; width:100%;} 
+.pagebreak { page-break-after: always; width:100%;}
 #html, #body, #wrapper { width:100%; }
 
 </style>
@@ -26,11 +26,11 @@
 <% @tournament.weights.sort_by{|w| w.max}.each do |w| %>
     <div class="pagebreak">
         <% @weight = w %>
-        <% @matches = @tournament.upcomingMatches.select{|m| m.weight_id == @weight.id} %>
+        <% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
         <% @wrestlers = Wrestler.where(weight_id: @weight.id) %>
        <% @pools = w.poolRounds(@matches) %>
         <h5><%= @weight.max %> lbs Bracket</h5>
-        
+
         <%= render 'pool' %>
     </div>
     <div class="pagebreak">
@@ -48,4 +48,4 @@
         <% end %>
     </div>
 <% end %>
-</div>
+</div>