merge dev

[auf_rh_dae.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 7fef0eb..1bd85f2 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -5,7 +5,7 @@ import socket
 from conf import *
 
 
-PROJET_TITRE = "SGRH"
+PROJET_TITRE = "Ressources humaines"
 
 # Rapports d'erreurs
 EMAIL_SUBJECT_PREFIX = '[auf_rh_dae - %s] ' % socket.gethostname()
@@ -62,6 +62,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.admin',
     'django_qbe',
+    'auf.django.emploi',
     'auf.django.admingroup',
     'ajax_select',
     'south',
@@ -87,8 +88,11 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.messages.context_processors.messages',
     'django.core.context_processors.request',
     'auf.django.skin.context_processors.auf',
-    'project.context_processors.utilisateur',
+    #'project.context_processors.utilisateur',
+    'project.context_processors.this_employe',
     'project.context_processors.user_is_admin',
+    'dae.context_processors.user_in_dae_groupes',
+    'recrutement.context_processors.user_in_recrutement_groupes',
 )
 
 AUTHENTICATION_BACKENDS = (