From: Benoit C. Sirois Date: Wed, 24 Apr 2013 14:56:57 +0000 (-0400) Subject: Fix for titulaire antérieur X-Git-Tag: 1.8~8 X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=f82612718bd290b9ffa2b7748b9a03b890b9057c;hp=e37247dbaefb4daff07861e7500249770efe07bc Fix for titulaire antérieur --- diff --git a/project/dae/forms.py b/project/dae/forms.py index cdc80b3..614c81d 100644 --- a/project/dae/forms.py +++ b/project/dae/forms.py @@ -770,7 +770,10 @@ class EmployeForm(forms.ModelForm): """ Mise à jour dynamique du contenu du menu des employés. """ request = kwargs.pop('request', None) super(EmployeForm, self).__init__(*args, **kwargs) - self.fields['employe'].choices = _employe_choices(self, request) + self.fields['employe'].choices = _employe_choices( + self, + request, + ) class DossierForm( diff --git a/project/dae/templates/dae/embauche.html b/project/dae/templates/dae/embauche.html index 11c4b73..06b98c0 100644 --- a/project/dae/templates/dae/embauche.html +++ b/project/dae/templates/dae/embauche.html @@ -336,6 +336,7 @@

Proposition de classement

+
@@ -365,6 +366,7 @@
+
{% include 'dae/embauche-remun.html' %} diff --git a/project/dae/views.py b/project/dae/views.py index 7277d8b..f5ae987 100644 --- a/project/dae/views.py +++ b/project/dae/views.py @@ -596,12 +596,16 @@ def embauche(request, key=None, dossier_id=None): cmp_form.fields['implantation'].queryset = imp_qs # Comment out for now. - # if dossier and dossier.poste: - # dossier_form.fields['employe_anterieur'].queryset = ( - # dossier_form.fields['employe_anterieur'].queryset.filter( - # rh_dossiers__poste=dossier.poste, - # ).distinct() - # ) + try: + rh_poste = poste.id_rh + except rh.Poste.DoesNotExist: + rh_poste = None + if dossier and rh_poste: + dossier_form.fields['employe_anterieur'].queryset = ( + dossier_form.fields['employe_anterieur'].queryset.filter( + rh_dossiers__poste__pk=rh_poste.pk, + ).distinct() + ) c = { 'type_remun': filtered_type_remun(),