From: Davin Baragiotta <davin.baragiotta@auf.org>
Date: Wed, 30 May 2012 21:17:58 +0000 (-0400)
Subject: redirect_interdiction niveau project
X-Git-Tag: 1.6.5~97^2^2~1^2~10
X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=acbc95a171f72a88f48736112ad334f108fc2e15

redirect_interdiction niveau project
---

diff --git a/project/dae/decorators.py b/project/dae/decorators.py
index b53554c..8aa7253 100644
--- a/project/dae/decorators.py
+++ b/project/dae/decorators.py
@@ -4,6 +4,8 @@ from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 
+from project.decorators import redirect_interdiction
+
 from project.dae.workflow import \
         dae_groupes, ETATS_EDITABLE, ETATS_VALIDE, grp_drh, grp_drh2
 from project.dae import models as dae
@@ -19,24 +21,6 @@ def user_in_dae_groupes(user):
             return True
     return False
 
-
-def redirect_interdiction(request, msg=u"Vous n'avez pas accès à cette page"):
-    """
-    Redirection du la page de login avec un message d'erreur.
-    """
-    from django.conf import settings
-    from django.contrib.auth import REDIRECT_FIELD_NAME
-    from django.utils.http import urlquote
-    login_url = settings.LOGIN_URL
-    path = urlquote(request.get_full_path())
-    tup = login_url, REDIRECT_FIELD_NAME, path
-    messages.add_message(
-        request, messages.ERROR,
-        "Votre compte ne permet pas d'accéder à cette partie de l'application."
-    )
-    return HttpResponseRedirect('%s?%s=%s' % tup)
-
-
 def dae_groupe_requis(fn):
     """
     L'accès à la plateforme nécessite d'appartenir au moins à un groupe, ou
diff --git a/project/dae/views.py b/project/dae/views.py
index 5dd8aee..acfa7af 100644
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -17,9 +17,11 @@ from sendfile import sendfile
 
 from auf.django.permissions.decorators import get_object
 
+from project.decorators import redirect_interdiction
+
 from project.dae import models as dae
 from project.dae.decorators import \
-        redirect_interdiction, dae_groupe_requis, \
+        dae_groupe_requis, \
         poste_dans_ma_region_ou_service, \
         dossier_dans_ma_region_ou_service, \
         vieux_dossier_dans_ma_region_ou_service, \
diff --git a/project/decorators.py b/project/decorators.py
index a521a7b..41c00dc 100644
--- a/project/decorators.py
+++ b/project/decorators.py
@@ -2,13 +2,13 @@
 """
 Décorateurs AUF
 """
-from django.contrib.auth.decorators import user_passes_test
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.contrib.auth.decorators import user_passes_test
+from django.core.urlresolvers import reverse
 from django.utils.http import urlquote
-from django.contrib import messages
 
 def redirect_interdiction(request, msg=u"Vous n'avez pas accès à cette page"):
     """
diff --git a/project/recrutement/views.py b/project/recrutement/views.py
index 30735be..383625a 100644
--- a/project/recrutement/views.py
+++ b/project/recrutement/views.py
@@ -10,7 +10,8 @@ from django.views.static import serve
 
 from auf.django.emploi import models as emploi
 
-from project.dae.decorators import redirect_interdiction
+from project.decorators import redirect_interdiction
+
 from project.recrutement import forms
 from project.recrutement import models
 from project.recrutement.workflow import recrutement_groupes
diff --git a/project/rh/views.py b/project/rh/views.py
index a1493da..dc7ee21 100644
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -20,6 +20,7 @@ from django.utils.encoding import smart_str
 from auf.django.references import models as ref
 
 from project.lib import get_employe_from_user
+from project.decorators import redirect_interdiction
 
 from project.rh import models as rh
 from project.rh import graph as rh_graph
@@ -30,7 +31,6 @@ from project.rh.masse_salariale import MasseSalariale
 from project.rh.templatetags.rapports import SortHeaders
 
 # pas de reference a DAE devrait etre refactorisé
-from project.dae.decorators import redirect_interdiction
 from project.dae.utils import get_employe_from_user
 from project.dae.workflow import grp_drh, grp_correspondants_rh
 
diff --git a/project/views.py b/project/views.py
index 92df683..ab19f9f 100644
--- a/project/views.py
+++ b/project/views.py
@@ -8,9 +8,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.views import login
 from django.shortcuts import get_object_or_404
 
-# pas de reference a DAE devrait etre refactorisé
-from project.dae.decorators import dae_groupe_requis
-from project.dae.decorators import redirect_interdiction
+from project.decorators import redirect_interdiction
 
 def index(request):
     return login(request, template_name='index.html')