summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/tournament_stage.rb4
-rw-r--r--config/application.rb3
2 files changed, 4 insertions, 3 deletions
diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb
index 8e0074d..0775305 100644
--- a/app/models/tournament_stage.rb
+++ b/app/models/tournament_stage.rb
@@ -41,7 +41,6 @@ class TournamentStage < ActiveRecord::Base
private
def set_scheduling
if @scheduling.nil?
- require "scheduling/#{self.scheduling}"
@scheduling = "Scheduling::#{self.scheduling.capitalize}".constantize.new(self)
end
return @scheduling
@@ -51,14 +50,13 @@ class TournamentStage < ActiveRecord::Base
def set_pairing
if @pairing.nil?
if(@tournament.randomized_teams)
- require "pairing/#{self.pairing}"
@pairing = "Pairing::RandomPairing"
- return @pairing
#elsif(setTeams)
#@pairing = Pre built
#return @pairing
end
end
+ return @pairing
end
private
diff --git a/config/application.rb b/config/application.rb
index 658e0aa..13bab0b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,6 +12,9 @@ module Leaguer
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
+ config.autoload_paths += ["#{Rails.root}/lib"]
+ config.watchable_dirs["#{Rails.root}/lib"] = [:rb]
+
I18n.enforce_available_locales = true
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.