From df00816308b7ffbb2c1eaf1bbe36da7da59d7778 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sat, 27 Feb 2021 20:06:53 -0300 Subject: [PATCH] =?UTF-8?q?altera=20url=20de=20primeira=20p=C3=A1gina=20se?= =?UTF-8?q?=20SAPL=5FAS=5FSAPN=20=3D=20True?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/norma/urls.py | 5 +++-- sapl/urls.py | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/sapl/norma/urls.py b/sapl/norma/urls.py index 3a941e0b3..47c3ef1c5 100644 --- a/sapl/norma/urls.py +++ b/sapl/norma/urls.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.conf.urls import include, url from sapl.norma.views import (AnexoNormaJuridicaCrud, AssuntoNormaCrud, @@ -9,6 +10,7 @@ from sapl.norma.views import (AnexoNormaJuridicaCrud, AssuntoNormaCrud, from .apps import AppConfig + app_name = AppConfig.name @@ -31,11 +33,10 @@ urlpatterns = [ url(r'^sistema/norma/vinculo/', include( TipoVinculoNormaJuridicaCrud.get_urls())), - url(r'^norma/pesquisar$', + url(r'^norma/pesquisar$' if not settings.SAPL_AS_SAPN else r'^$', NormaPesquisaView.as_view(), name='norma_pesquisa'), url(r'^norma/recuperar-norma$', recuperar_norma, name="recuperar_norma"), url(r'^norma/recuperar-numero-norma$', recuperar_numero_norma, name="recuperar_numero_norma"), - ] diff --git a/sapl/urls.py b/sapl/urls.py index cd06509e7..4004f447f 100644 --- a/sapl/urls.py +++ b/sapl/urls.py @@ -36,9 +36,15 @@ import sapl.redireciona_urls.urls import sapl.relatorios.urls import sapl.sessao.urls -urlpatterns = [ - url(r'^$', TemplateView.as_view(template_name='index.html'), - name='sapl_index'), +urlpatterns = [] + +if not settings.SAPL_AS_SAPN: + urlpatterns = [ + url(r'^$', TemplateView.as_view(template_name='index.html'), + name='sapl_index'), + ] + +urlpatterns += [ url(r'^message$', TemplateView.as_view(template_name='base.html')), url(r'^admin/', admin.site.urls), @@ -60,11 +66,13 @@ urlpatterns = [ url(r'', include(sapl.api.urls)), - url(r'^favicon\.ico$', RedirectView.as_view(url='/static/sapl/img/favicon.ico', permanent=True)), + url(r'^favicon\.ico$', RedirectView.as_view( + url='/static/sapl/img/favicon.ico', permanent=True)), url(r'', include(sapl.redireciona_urls.urls)), - path("robots.txt", TemplateView.as_view(template_name="robots.txt", content_type="text/plain")), + path("robots.txt", TemplateView.as_view( + template_name="robots.txt", content_type="text/plain")), ] @@ -75,9 +83,9 @@ if settings.DEBUG: import debug_toolbar urlpatterns += [ - url(r'^__debug__/', include(debug_toolbar.urls)), + url(r'^__debug__/', include(debug_toolbar.urls)), - ] + ] urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)