Moved to GsParemeter.get and set defaults for a couple of validations.

2 files changed, 4 insertions, 6 deletions

diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb
index 844ff32..e3fa11f 100644
--- a/config/initializers/gemeinschaft_parameters.rb
+++ b/config/initializers/gemeinschaft_parameters.rb
@@ -1,5 +1,3 @@
 # Set some constants.
 
-# GsParameter.all.each do |gs_parameter|
-#   gs_parameter.generate_constant
-# end
+
diff --git a/config/routes.rb b/config/routes.rb
index 4137965..ee333fe 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,7 +55,7 @@ Gemeinschaft42c::Application.routes.draw do
     end
   end
 
-  if CALLTHROUGH_HAS_WHITELISTS == true
+  if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
     resources :whitelists, :only => [] do
       resources :phone_numbers do
         member do
@@ -239,7 +239,7 @@ Gemeinschaft42c::Application.routes.draw do
     resources :conferences
     resources :phone_number_ranges
     resources :callthroughs
-    if CALLTHROUGH_HAS_WHITELISTS == true
+    if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
       resources :whitelists
     end
     resources :hunt_groups
@@ -254,7 +254,7 @@ Gemeinschaft42c::Application.routes.draw do
         put 'move_lower'
       end
     end
-    if CALLTHROUGH_HAS_WHITELISTS == true
+    if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
       resources :whitelists
     end
   end