From: Diane Trout <diane@caltech.edu>
Date: Mon, 9 May 2011 22:05:32 +0000 (-0700)
Subject: Move default_pm setting to a little more predictable of a location
X-Git-Tag: 0.5.2~41
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=d8f805b1f13195d66741a01822b6cde2fc3ce320

Move default_pm setting to a little more predictable of a location
---

diff --git a/settings.py b/settings.py
index 0f2d4da..199ffef 100644
--- a/settings.py
+++ b/settings.py
@@ -86,6 +86,8 @@ options_to_list(options, ADMINS, 'frontend', 'admins')
 MANAGERS = []
 options_to_list(options, MANAGERS, 'frontend', 'managers')
 
+DEFAULT_PM=int(options.get('frontend', 'default_pm'))
+
 AUTHENTICATION_BACKENDS = ( 
   'htsworkflow.frontend.samples.auth_backend.HTSUserModelBackend', )
 CUSTOM_USER_MODEL = 'samples.HTSUser' 
@@ -216,4 +218,3 @@ BCPRINTER_PRINTER1_PORT = int(options.get('bcprinter', 'printer1_port'))
 BCPRINTER_PRINTER2_HOST = options.get('bcprinter', 'printer2_host')
 BCPRINTER_PRINTER2_PORT = int(options.get('bcprinter', 'printer2_port'))
 
-DEFAULT_PM=int(options.get('frontend', 'default_pm'))