From 48b8a3c949769cb5347c987aacd16c6112cf94c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= Date: Wed, 10 Jan 2018 13:18:38 -0200 Subject: [PATCH] =?UTF-8?q?Finaliza=20a=20corre=C3=A7=C3=A3o=20de=20parlam?= =?UTF-8?q?entar=20ativo=20em=20comiss=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/comissoes/forms.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py index 05298e761..ed0f4ec93 100644 --- a/sapl/comissoes/forms.py +++ b/sapl/comissoes/forms.py @@ -37,10 +37,14 @@ class ParticipacaoForm(forms.ModelForm): qs = Parlamentar.objects.filter(id__in=parlamentares).distinct().\ exclude(id__in=id_part) - # eligible = self.verifica() - # result = list(set(qs) & set(eligible)) - # cmp(result, eli) # se igual a 0 significa que o qs e o eli são iguais! - self.fields['parlamentar'].queryset = qs + eligible = self.verifica() + result = list(set(qs) & set(eligible)) + if not cmp(result, eligible): # se igual a 0 significa que o qs e o eli são iguais! + self.fields['parlamentar'].queryset = qs + else: + ids = [e.id for e in eligible] + qs = Parlamentar.objects.filter(id__in=ids) + self.fields['parlamentar'].queryset = qs def create_participacao(self): composicao = Composicao.objects.get(id=self.initial['parent_pk'])