fix PJ access

diff --git a/project/rh/managers.py b/project/rh/managers.py
index 591ffec..d9487b8 100644 (file)
--- a/project/rh/managers.py
+++ b/project/rh/managers.py
@@ -65,6 +65,9 @@ class SecurityManager(models.Manager):
         if grp_drh in user.groups.all() or grp_drh2 in user.groups.all():
             liste = self.get_query_set().all()
 
+        if user.is_superuser:
+            liste = self.get_query_set().all()
+
         return liste
 
 

diff --git a/project/rh/urls.py b/project/rh/urls.py
index b9bc4a4..8a391d8 100644 (file)
--- a/project/rh/urls.py
+++ b/project/rh/urls.py
@@ -10,5 +10,5 @@ urlpatterns = patterns(
     url(r'^admin/rh/dossier/(\d+)/apercu/$', 'dossier_apercu', name='dossier_apercu'),
     url(r'^admin/rh/employe/(\d+)/apercu/$', 'employe_apercu', name='employe_apercu'),
     url(r'^admin/rh/poste/(\d+)/apercu/$', 'poste_apercu', name='poste_apercu'),
-    url(r'^prive/(.*)$', 'poste_piece'),
+    url(r'^prive/(?P<filename>.*)$', 'piece'),
 )

diff --git a/project/rh/views.py b/project/rh/views.py
index 1b341e6..5129425 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -14,14 +14,25 @@ from project.lib import get_employe_from_id
 from rh import models as rh
 from rh.lib import calc_remun
 
+# pas de reference a DAE devrait etre refactorisé
+from dae.utils import get_employe_from_user
+from dae.decorators import redirect_interdiction
+from dae.workflow import grp_drh, grp_correspondants_rh
+
 @login_required
-def poste_piece(request, filename):
+def piece(request, filename):
     """Téléchargement d'une pièce jointe à un poste."""
-    piece = get_object_or_404(rh.PostePiece, fichier=filename)
-    if rh.Poste.objects.ma_region_ou_service(request.user).filter(id=piece.poste_id).exists():
+    model, id, f = filename.split('/')
+    if model == 'employe':
+        # TODO definir peut-être un controle d'accès
+        piece = get_object_or_404(rh.EmployePiece, fichier=filename)
         return sendfile(request, piece.fichier.path)
-    else:
-        return redirect_interdiction(request)
+    if model == 'poste':
+        piece = get_object_or_404(rh.PostePiece, fichier=filename)
+        if rh.Poste.objects.ma_region_ou_service(request.user).filter(id=piece.poste_id).exists():
+            return sendfile(request, piece.fichier.path)
+        else:
+            return redirect_interdiction(request)
 
 # homes
 @login_required
@@ -208,9 +219,6 @@ def rapports_remuneration(request):
 def region_protected(model):
     def wrapper(func):
         def wrapped(request, id):
-            from dae.utils import get_employe_from_user
-            from dae.decorators import redirect_interdiction
-            from dae.workflow import grp_drh, grp_correspondants_rh
             if request.user.is_superuser:
                 return func(request, id)
             user_groups = request.user.groups.all()