From 9ad403c5d6a45bcb0368cd50458ba827b70d65cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Wed, 11 Mar 2020 12:19:24 -0300 Subject: [PATCH] =?UTF-8?q?Refatora=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/parlamentares/urls.py | 6 +++--- sapl/parlamentares/views.py | 7 +++++-- sapl/templates/parlamentares/mandato_form.html | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sapl/parlamentares/urls.py b/sapl/parlamentares/urls.py index b914f6fb4..60fbf3232 100644 --- a/sapl/parlamentares/urls.py +++ b/sapl/parlamentares/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import include, url from sapl.parlamentares.views import (CargoMesaCrud, ColigacaoCrud, - coligacao_legislatura_ajax, + coligacao_legislatura, ComposicaoColigacaoCrud, DependenteCrud, FiliacaoCrud, FrenteCrud, FrenteList, LegislaturaCrud, MandatoCrud, @@ -46,8 +46,8 @@ urlpatterns = [ url(r'^parlamentar/vincular-parlamentar/$', VincularParlamentarView.as_view(), name='vincular_parlamentar'), - url(r'^parlamentar/coligacao-legislatura-ajax/', - coligacao_legislatura_ajax, name="coligacao_legislatura_ajax"), + url(r'^parlamentar/coligacao-legislatura/', + coligacao_legislatura, name="coligacao_legislatura"), url(r'^sistema/coligacao/', include(ColigacaoCrud.get_urls() + diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index 09783612d..ebf116330 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -312,8 +312,11 @@ class ColigacaoCrud(CrudAux): return context -def coligacao_legislatura_ajax(request): - coligacoes = Coligacao.objects.filter(legislatura=request.GET['legislatura']).order_by('nome') +def coligacao_legislatura(request): + try: + coligacoes = Coligacao.objects.filter(legislatura=request.GET['legislatura']).order_by('nome') + except: + coligacoes = [] lista_coligacoes = [(coligacao.id, str(coligacao)) for coligacao in coligacoes] diff --git a/sapl/templates/parlamentares/mandato_form.html b/sapl/templates/parlamentares/mandato_form.html index 55b2ea5dc..fc658a7e8 100644 --- a/sapl/templates/parlamentares/mandato_form.html +++ b/sapl/templates/parlamentares/mandato_form.html @@ -13,12 +13,12 @@ if (id_legislatura){ $.get( - "{% url 'sapl.parlamentares:coligacao_legislatura_ajax' %}", + "{% url 'sapl.parlamentares:coligacao_legislatura' %}", {legislatura: id_legislatura}, function(data){ lista_coligacoes = data['coligacoes']; - $('#id_coligacao').append('');