X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=plgng%2Fsettings_common.py;h=6dc46896e5862a9c4de3e658a8cdae8e19570915;hb=1073f7f5b5a9e51fd79ab58f1f4fb3389d7e6331;hp=9095e9f3820a4aec2040448f76aacd54787f9f49;hpb=7bda7a06e0ff0c0159e355b3777e9f7b3f719f1b;p=qcg-portal.git

diff --git a/plgng/settings_common.py b/plgng/settings_common.py
index 9095e9f..6dc4689 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 *
@@ -33,6 +33,7 @@ INSTALLED_APPS = (
     'django.contrib.webdesign',
     'qcg',
     'filex',
+    'better_sessions',
     'django_openid_auth',
     'bootstrap3',
 )
@@ -45,10 +46,12 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'better_sessions.middleware.BetterSessionsMiddleware',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = defaults.TEMPLATE_CONTEXT_PROCESSORS + (
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
     'django.core.context_processors.request',
+    'better_sessions.context_processors.settings',
 )
 
 ROOT_URLCONF = 'plgng.urls'
@@ -88,7 +91,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
@@ -107,6 +110,7 @@ OPENID_STRICT_USERNAMES = True
 
 
 SESSION_COOKIE_NAME = 'qcg_session'
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
 
 
@@ -126,3 +130,6 @@ MESSAGE_TAGS = {
     messages.WARNING: 'alert alert-warning',
     messages.ERROR: 'alert alert-danger',
 }
+
+
+GRAPPELLI_ADMIN_TITLE = 'Portal UNRES'