projects
/
htsworkflow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ec24a6e
)
Move default_pm setting to a little more predictable of a location
author
Diane Trout
<diane@caltech.edu>
Mon, 9 May 2011 22:05:32 +0000
(15:05 -0700)
committer
Diane Trout
<diane@caltech.edu>
Mon, 9 May 2011 22:05:32 +0000
(15:05 -0700)
settings.py
patch
|
blob
|
history
diff --git
a/settings.py
b/settings.py
index 0f2d4da46c0eb93821addb9387c15960e1769cf7..199ffef81e82c7ff7d9a3a1c0e89f8d054477e6a 100644
(file)
--- 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')
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'
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'))
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'))