From 2bc12af193ecac45533cad297524474ae3c0075b Mon Sep 17 00:00:00 2001 From: Eliseu Egewarth Date: Mon, 22 May 2017 15:32:59 -0300 Subject: [PATCH] Refatora RedirecionaSAPLIndex Nomeia url '/' para 'sapl_index' Substitui ('/') por (reverse('sapl_index')) Signed-off-by: Eliseu Egewarth --- sapl/redireciona_urls/tests.py | 15 ++++++++++++++- sapl/redireciona_urls/views.py | 13 +++++++------ sapl/urls.py | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/sapl/redireciona_urls/tests.py b/sapl/redireciona_urls/tests.py index ea89d9da6..1e05751d9 100644 --- a/sapl/redireciona_urls/tests.py +++ b/sapl/redireciona_urls/tests.py @@ -7,8 +7,9 @@ class RedirecionaURLsTests(TestCase): response = self.client.get(reverse( 'sapl.redireciona_urls:redireciona_sapl_index') ) + url_e = reverse('sapl_index') self.assertEqual(response.status_code, 301) - self.assertEqual(response.url, "/") + self.assertEqual(response.url, url_e) def test_redireciona_parlamentar_list(self): # import ipdb; ipdb.set_trace() @@ -68,3 +69,15 @@ class RedirecionaURLsTests(TestCase): response = self.client.get(url) self.assertEqual(response.status_code, 301) self.assertEqual(response.url, url_e) + + + # def test_redireciona_comissao_list(self): + # url = reverse('sapl.redireciona_urls:redireciona_comissao') + # url_e = reverse( + # 'sapl.comissoes:comissao_list') + # response = self.client.get(url) + # self.assertEqual(response.status_code, 301) + # self.assertEqual(response.url, url_e) + + + # import ipdb; ipdb.set_trace() diff --git a/sapl/redireciona_urls/views.py b/sapl/redireciona_urls/views.py index e075be635..9353eeba2 100644 --- a/sapl/redireciona_urls/views.py +++ b/sapl/redireciona_urls/views.py @@ -38,12 +38,13 @@ relatorio_materia_por_tramitacao = (app_relatorios + ':materia_por_tramitacao') class RedirecionaSAPLIndex(RedirectView): permanent = True - def get(self, request, *args, **kwargs): - self.url = '/' - return super( - RedirecionaSAPLIndex, - self - ).get(self, request, *args, **kwargs) + def get_redirect_url(self): + url_pattern = 'sapl_index' + try: + url = reverse(url_pattern) + except NoReverseMatch: + raise UnknownUrlNameError(url_pattern) + return url class RedirecionaParlamentar(RedirectView): permanent = True diff --git a/sapl/urls.py b/sapl/urls.py index 4ca566ccd..91d3adeb6 100644 --- a/sapl/urls.py +++ b/sapl/urls.py @@ -35,7 +35,7 @@ import sapl.relatorios.urls import sapl.sessao.urls urlpatterns = [ - url(r'^$', TemplateView.as_view(template_name='index.html')), + url(r'^$', TemplateView.as_view(template_name='index.html'), name='sapl_index'), url(r'^message$', TemplateView.as_view(template_name='base.html')), url(r'^admin/', include(admin.site.urls)),