fix apercu employe

diff --git a/project/rh/views.py b/project/rh/views.py
index be914ca..f548fb0 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -645,14 +645,16 @@ def employe_apercu(request, employe_id):
     user_groups = request.user.groups.all()
     dossiers = None
 
-    if request.user.is_superuser or \
-       grp_drh in user_groups:
+    if in_drh_or_admin(request.user):
         q = Q(employe=employe)
-    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:
         regions = [
             d.poste.implantation.region for d in employe.rh_dossiers.all()
         ]
-        q = Q(employe=employe) & Q(implantation__region__in=regions)
+        q = Q(employe=employe) & Q(poste__implantation__region__in=regions)
 
     dossiers = rh.Dossier.objects.filter(q).order_by('-date_debut')
 

diff --git a/project/templates/menu.html b/project/templates/menu.html
index f57c529..dc396d7 100644 (file)
--- a/project/templates/menu.html
+++ b/project/templates/menu.html
@@ -34,12 +34,8 @@
         </li>
     </ul>
   </li>
-  {% endif %}
-    
-  {% if perms.rh %}
   <li>
     <a href="{% url admin:app_list app_label="rh" %}">Gestion des personnels</a>
   </li>
   {% endif %}
-
 </ul>