From 9857b749254bdee5710159a312885915406619a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Mon, 19 Mar 2012 14:50:06 -0400 Subject: [PATCH] fix DRH2 --- project/dae/decorators.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/project/dae/decorators.py b/project/dae/decorators.py index 49f53fa..0d8d55f 100644 --- a/project/dae/decorators.py +++ b/project/dae/decorators.py @@ -6,7 +6,8 @@ from django.contrib.auth.decorators import user_passes_test from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 -from workflow import dae_groupes, ETATS_EDITABLE, ETATS_VALIDE, grp_drh +from workflow import dae_groupes, ETATS_EDITABLE, ETATS_VALIDE, \ + grp_drh, grp_drh2 from project.dae import models as dae from project.rh import models as rh from utils import get_employe_from_user @@ -142,10 +143,11 @@ def employe_dans_ma_region_ou_service(fn): def dossier_est_modifiable(fn): def inner(request, *args, **kwargs): dossier_id = kwargs.get('dossier_id', None) + user_groupes = request.user.groups.all() if dossier_id is not None: dossier = dae.Dossier.objects.get(id=dossier_id) if not (dossier.etat in ETATS_EDITABLE and - (grp_drh in request.user.groups.all() or + (grp_drh in user_groupes or grp_drh2 in user_groupes or dossier in dae.Dossier.objects.mes_choses_a_faire(request.user).all())): msg = u"Ce dossier d'embauche ne peut plus être modifié." return redirect_interdiction(request, msg) @@ -173,8 +175,9 @@ def get_contrat(fn): def inner(request, contrat_id, *args, **kwargs): contrat = get_object_or_404(dae.Contrat, pk=contrat_id) dossier = contrat.dossier + user_groupes = request.user.groups.all() if not (dossier.etat in ETATS_VALIDE and - (grp_drh in request.user.groups.all() or + (grp_drh in user_groupes or grp_drh2 in user_groupes or dossier in dae.Dossier.objects.mes_choses_a_faire(request.user).all())): return redirect_interdiction(request) return fn(request, contrat, *args, **kwargs) -- 1.7.10.4