From f82612718bd290b9ffa2b7748b9a03b890b9057c Mon Sep 17 00:00:00 2001
From: "Benoit C. Sirois" <benoit.clennett-sirois@auf.org>
Date: Wed, 24 Apr 2013 10:56:57 -0400
Subject: [PATCH 1/1] =?utf8?q?Fix=20for=20titulaire=20ant=C3=A9rieur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 project/dae/forms.py                    |    5 ++++-
 project/dae/templates/dae/embauche.html |    2 ++
 project/dae/views.py                    |   16 ++++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

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 @@
       <fieldset>
 	<div>
           <div class="gauche"><h2>Proposition de classement</h2></div>
+	  <div class="clear"></div>
           <div class="gauche">
             <table class="gauche">
 		<tr>
@@ -365,6 +366,7 @@
 	    </table>
 	  </div>
 	</div>
+	<div class="clear"></div>
       {% include 'dae/embauche-remun.html' %}
 
       <!-- <select id="type-remun" name="type-remun"> -->
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(),
-- 
1.7.10.4