Refactored generating matches

app/controllers/static_pages_controller.rb

@@ -87,15 +87,15 @@ class StaticPagesController < ApplicationController
 	end
 	
 	def generate_matches
-		if user_signed_in?
-	    else
+		if !user_signed_in?
 	      redirect_to root_path
-	    end
-		if params[:tournament]
-	      @tournament = Tournament.find(params[:tournament])
-	    end
-	    if @tournament
-	 		@tournament.generateMatchups
-	    end
+	    elsif user_signed_in?
+			if params[:tournament]
+	      		@tournament = Tournament.find(params[:tournament])
+			end
+	    	if @tournament
+	 			@tournament.generateMatchups
+	    	end
+		end
 	end
 end

app/models/tournament.rb

@@ -13,7 +13,7 @@ class Tournament < ActiveRecord::Base
 		@matches = Match.where(tournament_id: self.id)
 	end
 
-  def createCustomWeights(value)
+  	def createCustomWeights(value)
 		self.weights.destroy_all
 		if value == 'hs'
 			@weights = [106,113,120,132,138,145,152,160,170,182,195,220,285]
@@ -30,7 +30,6 @@ class Tournament < ActiveRecord::Base
 		if matches.nil?
 			return nil
 		else
-			generateMatchups
 			matches
 		end
 	end