diff --git a/sapl/comissoes/migrations/0003_auto_20170914_1600.py b/sapl/comissoes/migrations/0003_auto_20170914_1600.py new file mode 100644 index 000000000..e868981a1 --- /dev/null +++ b/sapl/comissoes/migrations/0003_auto_20170914_1600.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2017-09-14 16:00 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('comissoes', '0002_auto_20170809_1236'), + ] + + operations = [ + migrations.AlterField( + model_name='comissao', + name='nome', + field=models.CharField(max_length=160, verbose_name='Nome'), + ), + ] diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py index 0b3c664ee..be8f0e8f6 100644 --- a/sapl/comissoes/models.py +++ b/sapl/comissoes/models.py @@ -35,7 +35,7 @@ class Comissao(models.Model): tipo = models.ForeignKey(TipoComissao, on_delete=models.PROTECT, verbose_name=_('Tipo')) - nome = models.CharField(max_length=100, verbose_name=_('Nome')) + nome = models.CharField(max_length=160, verbose_name=_('Nome')) sigla = models.CharField(max_length=10, verbose_name=_('Sigla')) data_criacao = models.DateField(verbose_name=_('Data de Criação')) data_extincao = models.DateField( 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):