From dd3353779d095d26aea904e64c37cbf3d6d24fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Cantu=C3=A1ria?= Date: Fri, 22 Feb 2019 16:54:09 -0300 Subject: [PATCH] =?UTF-8?q?Remo=C3=A7=C3=A3o=20de=20mandato=20na=20cria?= =?UTF-8?q?=C3=A7=C3=A3o=20do=20parlamentar=20Co-authored-by:=20UlyssesBML?= =?UTF-8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/parlamentares/forms.py | 18 +++++++++++------- sapl/templates/parlamentares/layouts.yaml | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sapl/parlamentares/forms.py b/sapl/parlamentares/forms.py index c7c8c9f9d..1237f3b56 100755 --- a/sapl/parlamentares/forms.py +++ b/sapl/parlamentares/forms.py @@ -146,6 +146,10 @@ class MandatoForm(ModelForm): return self.cleaned_data +class MandatoCreateForm(MandatoForm): + pass + + class LegislaturaForm(ModelForm): logger = logging.getLogger(__name__) @@ -234,13 +238,13 @@ class ParlamentarCreateForm(ParlamentarForm): @transaction.atomic def save(self, commit=True): parlamentar = super(ParlamentarCreateForm, self).save(commit) - legislatura = self.cleaned_data['legislatura'] - Mandato.objects.create( - parlamentar=parlamentar, - legislatura=legislatura, - data_inicio_mandato=legislatura.data_inicio, - data_fim_mandato=legislatura.data_fim, - data_expedicao_diploma=self.cleaned_data['data_expedicao_diploma']) + # legislatura = self.cleaned_data['legislatura'] + # Mandato.objects.create( + # parlamentar=parlamentar, + # legislatura=legislatura, + # data_inicio_mandato=legislatura.data_inicio, + # data_fim_mandato=legislatura.data_fim, + # data_expedicao_diploma=self.cleaned_data['data_expedicao_diploma']) content_type = ContentType.objects.get_for_model(Parlamentar) object_id = parlamentar.pk tipo = TipoAutor.objects.get(content_type=content_type) diff --git a/sapl/templates/parlamentares/layouts.yaml b/sapl/templates/parlamentares/layouts.yaml index ded7ca647..5a118c1df 100644 --- a/sapl/templates/parlamentares/layouts.yaml +++ b/sapl/templates/parlamentares/layouts.yaml @@ -64,8 +64,8 @@ ParlamentarUpdate: - biografia ParlamentarCreate: - {% trans 'Dados do Mandato' %}: - - legislatura data_expedicao_diploma +# {% trans 'Dados do Mandato' %}: +# - legislatura data_expedicao_diploma {% trans 'Cadastro do Parlamentar' %}: - nome_parlamentar:8 ativo - nome_completo