From a75bd55c2cd3d8b53f61aa8d700fc510c8308f57 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 28 Apr 2014 10:00:47 -0400 Subject: remove dead references to {Tournament,Game}#sampling_method --- app/controllers/tournaments_controller.rb | 1 - app/models/tournament.rb | 4 ---- app/models/tournament_stage.rb | 4 ---- 3 files changed, 9 deletions(-) diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 0947ac8..471c5da 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -191,7 +191,6 @@ class TournamentsController < ApplicationController p[:max_players_per_team] ||= game.max_players_per_team p[:min_teams_per_match] ||= game.min_teams_per_match p[:max_teams_per_match] ||= game.max_teams_per_match - p[:sampling_method] ||= game.sampling_method p[:scoring_method] ||= game.scoring_method end return p diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 46a2ba7..b867716 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -100,10 +100,6 @@ class Tournament < ActiveRecord::Base @scoring ||= "Scoring::#{self.scoring_method.camelcase}".constantize end - def sampling - @sampling ||= "Sampling::#{self.sampling_method.camelcase}".constantize - end - # YISSSSSS def scoring_methods diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb index caf5a8a..19b9c23 100644 --- a/app/models/tournament_stage.rb +++ b/app/models/tournament_stage.rb @@ -31,10 +31,6 @@ class TournamentStage < ActiveRecord::Base @scoring ||= tournament.scoring end - def sampling - @sampling ||= tournament.sampling - end - def scheduling @scheduling ||= "Scheduling::#{self.scheduling_method.camelcase}".constantize.new(self) end -- cgit v1.2.3