fix perms

diff --git a/project/rh/views.py b/project/rh/views.py
index 0f0cf1a..be914ca 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -30,6 +30,8 @@ from dae.utils import get_employe_from_user
 from dae.decorators import redirect_interdiction
 from dae.workflow import grp_drh, grp_correspondants_rh
 from django.conf import settings
+from project.rh.decorators import in_drh_or_admin
+from project.rh import groups
 
 
 @login_required
@@ -576,9 +578,11 @@ def region_protected(model):
             if request.user.is_superuser:
                 return func(request, id)
             user_groups = request.user.groups.all()
-            if grp_drh in user_groups:
+            if in_drh_or_admin(request.user):
                 return func(request, id)
-            if grp_correspondants_rh in user_groups:
+            if groups.grp_correspondants_rh in user_groups or\
+               groups.grp_administrateurs in user_groups or\
+               groups.grp_directeurs_bureau in user_groups:
                 employe = get_employe_from_user(request.user)
                 q = Q(**{
                     model.prefix_implantation: employe.implantation.region

diff --git a/project/templates/menu.html b/project/templates/menu.html
index e1fb1a9..f57c529 100644 (file)
--- a/project/templates/menu.html
+++ b/project/templates/menu.html
@@ -5,14 +5,11 @@
     <a href="{% url index %}">Accueil</a>
   </li>
 
-  {% if perms.rh %}
+  {% if request.user.is_authenticated %}
   <li>
     <a href="{% url admin:app_list app_label="recrutement" %}">Gestion des
         candidatures</a>
   </li>
-  {% endif %}
-
-  {% if request.user.is_authenticated %}
   <li class="{% menu_actif request '^dae$' %}">
     <a href="{% url dae_index %}">Demande d'autorisation d'engagement</a>
     <ul>