projects
/
qcg-portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
job templates: saving and deleting
[qcg-portal.git]
/
plgng
/
settings_common.py
diff --git
a/plgng/settings_common.py
b/plgng/settings_common.py
index
9095e9f
..
a6c93aa
100644
(file)
--- a/
plgng/settings_common.py
+++ b/
plgng/settings_common.py
@@
-11,7
+11,7
@@
https://docs.djangoproject.com/en/1.7/ref/settings/
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os
-import django.conf.global_settings as defaults
+from django.conf import global_settings
from django.contrib.messages import constants as messages
from local import *
from django.contrib.messages import constants as messages
from local import *
@@
-47,7
+47,7
@@
MIDDLEWARE_CLASSES = (
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
-TEMPLATE_CONTEXT_PROCESSORS = defaults.TEMPLATE_CONTEXT_PROCESSORS + (
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
'django.core.context_processors.request',
)
'django.core.context_processors.request',
)
@@
-88,7
+88,7
@@
AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
)
'django.contrib.auth.backends.ModelBackend',
)
-LOGIN_URL = 'openid-login'
+LOGIN_URL = 'login'
LOGIN_REDIRECT_URL = '/jobs/'
# If set, always use this as the identity URL rather than asking the
LOGIN_REDIRECT_URL = '/jobs/'
# If set, always use this as the identity URL rather than asking the
@@
-126,3
+126,6
@@
MESSAGE_TAGS = {
messages.WARNING: 'alert alert-warning',
messages.ERROR: 'alert alert-danger',
}
messages.WARNING: 'alert alert-warning',
messages.ERROR: 'alert alert-danger',
}
+
+
+GRAPPELLI_ADMIN_TITLE = 'Portal QCG'