Commit 5505eb57 authored by Gabriel Detraz's avatar Gabriel Detraz Committed by root

Adaptation des imports settings django 1.10 (template remplace core)

parent 813f73a6
......@@ -69,8 +69,10 @@ ALLOWED_HOSTS = [
'intranet.crans.org',
'intranet-dev.crans.org',
'intranet-apprentis.crans.org',
'vo.crans.org',
]
ATOMIC_REQUESTS = True
MANAGERS = ADMINS
......@@ -84,7 +86,7 @@ if DB_HOST:
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'django',
'HOST': DB_HOST,
#'HOST': DB_HOST,
'USER': 'crans',
},
}
......@@ -156,11 +158,11 @@ MIDDLEWARE_CLASSES = (
TEMPLATE_CONTEXT_PROCESSORS = (
"django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.template.context_processors.debug",
"django.template.context_processors.i18n",
"django.template.context_processors.media",
"django.contrib.messages.context_processors.messages",
"django.core.context_processors.request",
"django.template.context_processors.request",
)
TEMPLATE_CONTEXT_PROCESSORS += (
......@@ -171,6 +173,17 @@ if os.getenv('DBG_LDAP'):
'intranet.custom_context_processor.password_hint',
)
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR,'templates')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': TEMPLATE_CONTEXT_PROCESSORS
},
},]
ROOT_URLCONF = 'intranet.urls'
# Dossiers où trouver des templates, hardcodé (chaque apps qui a un
......@@ -232,13 +245,6 @@ INTRANET_APPS = (
'label': _(u'Gestion des digicodes'),
'title': _(u"Gestion des codes d'accès au local d'impression (4J)"),
},
{
'name': 'news',
'category': 'Services',
'label': _(u'Les news du campus'),
'title': _(u"Les news du campus"),
'test': lambda u: u.groups.filter(name='crans_nounou') or u.groups.filter(name='crans_cableur'),
},
{
'name': 'wifimap',
'title': _(u'Carte des positions et état des bornes wifi Cr@ns'),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment