X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=plgng%2Fsettings_common.py;h=a6c93aa2252850a36ec10fa3e12470b39f9b8cd6;hb=a48622a1086a47a1abc26dcd3d1d05a384eb1e8f;hp=9095e9f3820a4aec2040448f76aacd54787f9f49;hpb=7bda7a06e0ff0c0159e355b3777e9f7b3f719f1b;p=qcg-portal.git diff --git a/plgng/settings_common.py b/plgng/settings_common.py index 9095e9f..a6c93aa 100644 --- 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 -import django.conf.global_settings as defaults +from django.conf import global_settings from django.contrib.messages import constants as messages from local import * @@ -47,7 +47,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -TEMPLATE_CONTEXT_PROCESSORS = defaults.TEMPLATE_CONTEXT_PROCESSORS + ( +TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( 'django.core.context_processors.request', ) @@ -88,7 +88,7 @@ AUTHENTICATION_BACKENDS = ( '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 @@ -126,3 +126,6 @@ MESSAGE_TAGS = { messages.WARNING: 'alert alert-warning', messages.ERROR: 'alert alert-danger', } + + +GRAPPELLI_ADMIN_TITLE = 'Portal QCG'