From fae96b5fca403efda7195ce2b40268c78eeb7c3a Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 14 Sep 2017 15:08:50 -0300 Subject: [PATCH 1/4] Bug Fix --- sapl/sessao/forms.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 9d4a7c0d3..656a0e1cc 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -159,6 +159,9 @@ class ExpedienteMateriaForm(ModelForm): def clean(self): super(ExpedienteMateriaForm, self).clean() + if self.errors: + return self.errors + cleaned_data = self.cleaned_data sessao = self.instance.sessao_plenaria From cd30c94e23d77a7de55b2fc4e14fcc9910ebbad9 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Thu, 14 Sep 2017 15:50:30 -0300 Subject: [PATCH 2/4] Adiciona checagem em clean() de ordemdia e maexpedientemateria --- sapl/sessao/forms.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 656a0e1cc..a31aee70a 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -157,12 +157,11 @@ class ExpedienteMateriaForm(ModelForm): return self.instance.sessao_plenaria.data_inicio def clean(self): - super(ExpedienteMateriaForm, self).clean() + cleaned_data = super(ExpedienteMateriaForm, self).clean() - if self.errors: - return self.errors + if not self.is_valid(): + return cleaned_data - cleaned_data = self.cleaned_data sessao = self.instance.sessao_plenaria try: @@ -220,7 +219,9 @@ class OrdemDiaForm(ExpedienteMateriaForm): return self.cleaned_data['numero_ordem'] def clean(self): - super(OrdemDiaForm, self).clean() + cleaned_data = super(OrdemDiaForm, self).clean() + if not self.is_valid(): + return cleaned_data return self.cleaned_data def save(self, commit=False): From 8e9d911eec0d50228961ed00f22318a5d76dbcce Mon Sep 17 00:00:00 2001 From: Luciano Henrique Nunes de Almeida Date: Fri, 15 Sep 2017 14:07:54 -0300 Subject: [PATCH 3/4] =?UTF-8?q?Concerta=20data=20de=20fim=20de=20mandato?= =?UTF-8?q?=20na=20migra=C3=A7=C3=A3o=20(#1484)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luciano Almeida --- sapl/legacy/migration.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sapl/legacy/migration.py b/sapl/legacy/migration.py index b03514366..2d586c326 100644 --- a/sapl/legacy/migration.py +++ b/sapl/legacy/migration.py @@ -424,9 +424,9 @@ def adjust_mandato(new, old): if old.dat_fim_mandato: new.data_fim_mandato = old.dat_fim_mandato if not new.data_fim_mandato: - legislatura = Legislatura.objects.latest('data_fim') - new.data_fim_mandato = legislatura.data_fim - new.data_expedicao_diploma = legislatura.data_inicio + new.data_fim_mandato = new.legislatura.data_fim + if not new.data_inicio_mandato: + new.data_inicio_mandato = new.legislatura.data_inicio def adjust_ordemdia_antes_salvar(new, old): From 2e61fb82f3d4f979c152229368cda742c8292dc5 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 15 Sep 2017 14:08:44 -0300 Subject: [PATCH 4/4] Fix #1292 info ordemdia expediente (#1480) * Fix #1292 * HOT FIX --- sapl/sessao/forms.py | 1 - sapl/sessao/views.py | 28 +++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index a31aee70a..5f2e8303c 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -158,7 +158,6 @@ class ExpedienteMateriaForm(ModelForm): def clean(self): cleaned_data = super(ExpedienteMateriaForm, self).clean() - if not self.is_valid(): return cleaned_data diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 86e7a03eb..cf3cab735 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -154,13 +154,31 @@ def abrir_votacao(request, pk, spk): reverse('sapl.sessao:' + redirect_url, kwargs={'pk': spk})) -def put_link_materia(context): +def customize_link_materia(context): for i, row in enumerate(context['rows']): materia = context['object_list'][i].materia url_materia = reverse('sapl.materia:materialegislativa_detail', kwargs={'pk': materia.id}) - - context['rows'][i][1] = (row[1][0], url_materia) + numeracao = materia.numeracao_set.first() + autoria = materia.autoria_set.filter( + primeiro_autor=True).first() + if autoria: + autor = autoria.autor + num_protocolo = materia.numero_protocolo + + title_materia = '''%s
+ Número de Processo: %s
+ Autor: %s
+ Número de Protocolo: %s
+ ''' % (url_materia, + row[1][0], + numeracao if numeracao else '', + autor if autor else '', + num_protocolo if num_protocolo else '') + + # Na linha abaixo, o segundo argumento é None para não colocar + # url em toda a string de title_materia + context['rows'][i][1] = (title_materia, None) return context @@ -229,7 +247,7 @@ class MateriaOrdemDiaCrud(MasterDetailCrud): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - return put_link_materia(context) + return customize_link_materia(context) def get_rows(self, object_list): for obj in object_list: @@ -352,7 +370,7 @@ class ExpedienteMateriaCrud(MasterDetailCrud): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - return put_link_materia(context) + return customize_link_materia(context) def get_rows(self, object_list): for obj in object_list: