From 829eb351b36b27b05638d99d5ea8717604106cc9 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Wed, 9 Nov 2011 12:41:24 -0500 Subject: [PATCH] =?utf8?q?Bugfix:=20les=20formulaires=20pour=20nouveau=20pos?= =?utf8?q?te=20et=20nouvelle=20DAE=20=C3=A9taient=20bris=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- project/dae/views.py | 19 +++++++++++++++---- project/rh_v1/models.py | 1 - 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/project/dae/views.py b/project/dae/views.py index cb26566..b08c921 100644 --- a/project/dae/views.py +++ b/project/dae/views.py @@ -181,9 +181,14 @@ def poste(request, key=None): form = PosteForm(initial=data, instance=poste, request=request) piecesForm = PostePieceForm(instance=poste) financementForm = FinancementForm(instance=poste) - comparaisons_formset = PosteComparaisonFormSet( - queryset=poste.comparaisons_internes.ma_region_ou_service(request.user) - ) + if isinstance(poste, dae.Poste): + comparaisons_formset = PosteComparaisonFormSet( + queryset=poste.comparaisons_internes.ma_region_ou_service(request.user) + ) + else: + comparaisons_formset = PosteComparaisonFormSet( + queryset=dae.PosteComparaison.objects.none() + ) vars.update(dict( form=form, poste=poste, poste_key=key, piecesForm=piecesForm, @@ -354,7 +359,13 @@ def embauche(request, key=None, dossier_id=None): ) remunForm = RemunForm(instance=dossier) - comparaisons_internes = dossier.poste.comparaisons_internes.ma_region_ou_service(request.user) + try: + comparaisons_internes = dossier.poste.comparaisons_internes.ma_region_ou_service( + request.user + ) + except dae.Poste.DoesNotExist: + comparaisons_internes = [] + return render_to_response('dae/embauche.html', { 'type_remun': filtered_type_remun(), 'devises': devises(), diff --git a/project/rh_v1/models.py b/project/rh_v1/models.py index d1167af..71e0ce5 100644 --- a/project/rh_v1/models.py +++ b/project/rh_v1/models.py @@ -315,7 +315,6 @@ class PosteManager(SecurityManager): """ Chargement de tous les objets FK existants sur chaque QuerySet. """ - prefixe_service = "service" prefixe_implantation = "implantation__region" def get_query_set(self): -- 1.7.10.4