diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4e8c9e452..52f82a4a7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,6 @@ dj-database-url==0.4.1 django-haystack==2.6.0 -django>=1.9,<1.10 +django>=1.10,<1.11 # TODO O django-admin-bootstrapped 2.5.7 não inseriu a mudança que permite # a compatibilidade com Django 1.9+. A linha abaixo será mudada quando uma # nova versão do django-admin-bootstrapped for lançada diff --git a/sapl/base/tests/teststub_urls.py b/sapl/base/tests/teststub_urls.py index 9796768f2..1a217f656 100644 --- a/sapl/base/tests/teststub_urls.py +++ b/sapl/base/tests/teststub_urls.py @@ -1,11 +1,10 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from django.views.generic.base import TemplateView from sapl.urls import urlpatterns as original_patterns -ptrn = patterns('', - url(r'^zzzz$', +ptrn = [ url(r'^zzzz$', TemplateView.as_view( - template_name='index.html'), name='zzzz')) + template_name='index.html'), name='zzzz')] urlpatterns = original_patterns + ptrn diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py index e3d9845c3..0466cd5e6 100644 --- a/sapl/comissoes/forms.py +++ b/sapl/comissoes/forms.py @@ -66,6 +66,11 @@ class ParticipacaoCreateForm(forms.ModelForm): def clean(self): super(ParticipacaoCreateForm, self).clean() + cleaned_data = self.cleaned_data + + if self.errors: + return cleaned_data + return self.cleaned_data def verifica(self): @@ -124,6 +129,10 @@ class ComissaoForm(forms.ModelForm): def clean(self): super(ComissaoForm, self).clean() + cleaned_data = self.cleaned_data + + if self.errors: + return cleaned_data if self.cleaned_data['data_extincao']: if (self.cleaned_data['data_extincao'] < @@ -159,6 +168,12 @@ class ReuniaoForm(ModelForm): def clean(self): super(ReuniaoForm, self).clean() + cleaned_data = self.cleaned_data + + + + if self.errors: + return cleaned_data if self.cleaned_data['hora_fim']: if (self.cleaned_data['hora_fim'] < @@ -186,9 +201,18 @@ class DocumentoAcessorioCreateForm(forms.ModelForm): return self.create_documentoacessorio() + + def create_documentoacessorio(self): reuniao = Reuniao.objects.get(id=self.initial['parent_pk']) + + + + def create_documentoacessorio(self): + reuniao = Reuniao.objects.get(id=self.initial['parent_pk']) + + def clean(self): super(DocumentoAcessorioCreateForm, self).clean() return self.cleaned_data diff --git a/sapl/comissoes/tests/test_comissoes.py b/sapl/comissoes/tests/test_comissoes.py index fee303192..68975718b 100644 --- a/sapl/comissoes/tests/test_comissoes.py +++ b/sapl/comissoes/tests/test_comissoes.py @@ -72,7 +72,9 @@ def test_incluir_comissao_submit(admin_client): 'nome': 'Comissão Teste', 'sigla': 'CT', 'data_criacao': '2016-03-22', - 'salvar': 'salvar'}, + 'unidade_deliberativa': True, + 'salvar': 'salvar' + }, follow=True) assert response.status_code == 200 diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index d89f30578..9e4a22e1c 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -166,9 +166,11 @@ class MateriaLegislativaForm(ModelForm): def clean(self): super(MateriaLegislativaForm, self).clean() - cleaned_data = self.cleaned_data + if self.errors: + return cleaned_data + data_apresentacao = cleaned_data['data_apresentacao'] ano = cleaned_data['ano'] @@ -199,6 +201,9 @@ class UnidadeTramitacaoForm(ModelForm): cleaned_data = self.cleaned_data + if self.errors: + return cleaned_data + for key in list(cleaned_data.keys()): if cleaned_data[key] is None: del cleaned_data[key] @@ -297,7 +302,7 @@ class TramitacaoForm(ModelForm): data_tram_form = cleaned_data['data_tramitacao'] if self.errors: - return self.errors + return cleaned_data ultima_tramitacao = Tramitacao.objects.filter( materia_id=self.instance.materia_id).exclude( @@ -367,6 +372,12 @@ class TramitacaoUpdateForm(TramitacaoForm): } def clean(self): + super(TramitacaoUpdateForm, self).clean() + cleaned_data = self.cleaned_data + + if self.errors: + return cleaned_data + ultima_tramitacao = Tramitacao.objects.filter( materia_id=self.instance.materia_id).order_by( '-data_tramitacao', @@ -423,11 +434,11 @@ class LegislacaoCitadaForm(ModelForm): def clean(self): super(LegislacaoCitadaForm, self).clean() + cleaned_data = self.cleaned_data if self.errors: - return self.errors + return cleaned_data - cleaned_data = self.cleaned_data try: norma = NormaJuridica.objects.get( @@ -486,9 +497,10 @@ class NumeracaoForm(ModelForm): def clean(self): super(NumeracaoForm, self).clean() + cleaned_data = self.cleaned_data if self.errors: - return self.errors + return cleaned_data try: MateriaLegislativa.objects.get( @@ -531,11 +543,11 @@ class AnexadaForm(ModelForm): def clean(self): super(AnexadaForm, self).clean() + cleaned_data = self.cleaned_data if self.errors: - return self.errors + return cleaned_data - cleaned_data = self.cleaned_data try: materia_anexada = MateriaLegislativa.objects.get( @@ -724,9 +736,10 @@ class DespachoInicialForm(ModelForm): def clean(self): super(DespachoInicialForm, self).clean() + cleaned_data = self.cleaned_data if self.errors: - return self.errors + return cleaned_data if DespachoInicial.objects.filter( materia=self.instance.materia, @@ -769,9 +782,10 @@ class AutoriaForm(ModelForm): def clean(self): cd = super(AutoriaForm, self).clean() + cleaned_data = self.cleaned_data if self.errors: - return self.errors + return cleaned_data autorias = Autoria.objects.filter( materia=self.instance.materia, autor=cd['autor']) @@ -992,6 +1006,10 @@ class TipoProposicaoForm(ModelForm): def clean(self): super(TipoProposicaoForm, self).clean() + cleaned_data = self.cleaned_data + + if self.errors: + return cleaned_data cd = self.cleaned_data @@ -1067,7 +1085,7 @@ class TipoProposicaoSelect(Select): str(data_has_perfil), force_text(option_label)) - def render_options(self, choices, selected_choices): + def render_options(self, selected_choices): # Normalize to strings. selected_choices = set(force_text(v) for v in selected_choices) output = [] @@ -1226,6 +1244,10 @@ class ProposicaoForm(forms.ModelForm): def clean(self): super(ProposicaoForm, self).clean() + cleaned_data = self.cleaned_data + + if self.errors: + return cleaned_data cd = self.cleaned_data @@ -1318,6 +1340,10 @@ class DevolverProposicaoForm(forms.ModelForm): def clean(self): super(DevolverProposicaoForm, self).clean() + cleaned_data = self.cleaned_data + + if self.errors: + return cleaned_data cd = self.cleaned_data @@ -1500,6 +1526,10 @@ class ConfirmarProposicaoForm(ProposicaoForm): def clean(self): super(ConfirmarProposicaoForm, self).clean() + cleaned_data = self.cleaned_data + + if self.errors: + return cleaned_data numeracao = sapl.base.models.AppConfig.attr('sequencia_numeracao') diff --git a/sapl/norma/forms.py b/sapl/norma/forms.py index 87a44d41f..69c51092f 100644 --- a/sapl/norma/forms.py +++ b/sapl/norma/forms.py @@ -192,10 +192,10 @@ class NormaRelacionadaForm(ModelForm): def clean(self): super(NormaRelacionadaForm, self).clean() + cleaned_data = self.cleaned_data if self.errors: - return self.errors - cleaned_data = self.cleaned_data + return cleaned_data try: norma_relacionada = NormaJuridica.objects.get( diff --git a/sapl/parlamentares/forms.py b/sapl/parlamentares/forms.py index a159ca233..f7e1cc740 100644 --- a/sapl/parlamentares/forms.py +++ b/sapl/parlamentares/forms.py @@ -257,9 +257,10 @@ class FiliacaoForm(ModelForm): def clean(self): super(FiliacaoForm, self).clean() + cleaned_data = self.cleaned_data if self.errors: - return self.errors + return cleaned_data filiacao = super(FiliacaoForm, self).save(commit=False) validacao = validar_datas(self.cleaned_data['data'], diff --git a/sapl/test_urls.py b/sapl/test_urls.py index ebc88da2b..933c25ec6 100644 --- a/sapl/test_urls.py +++ b/sapl/test_urls.py @@ -56,7 +56,7 @@ def create_perms_post_migrate(sapl_app_config): ctype = ContentType.objects.get_for_model(klass) ctypes.add(ctype) - for perm in _get_all_permissions(klass._meta, ctype): + for perm in _get_all_permissions(klass._meta): searched_perms.append((ctype, perm)) all_perms = set(Permission.objects.filter(