Browse Source

rename view and urls from app frontend

pull/2523/head
Leandro Roberto 7 years ago
parent
commit
abea213cc7
  1. 13
      sapl/base/urls.py
  2. 16
      sapl/base/views.py
  3. 12
      sapl/templates/entry_point.html

13
sapl/base/urls.py

@ -43,9 +43,12 @@ app_name = AppConfig.name
admin_user = [ admin_user = [
url(r'^sistema/usuario/$', PesquisarUsuarioView.as_view(), name='usuario'), url(r'^sistema/usuario/$', PesquisarUsuarioView.as_view(), name='usuario'),
url(r'^sistema/usuario/create$', CreateUsuarioView.as_view(), name='user_create'), url(r'^sistema/usuario/create$',
url(r'^sistema/usuario/(?P<pk>\d+)/edit$', EditUsuarioView.as_view(), name='user_edit'), CreateUsuarioView.as_view(), name='user_create'),
url(r'^sistema/usuario/(?P<pk>\d+)/delete$', DeleteUsuarioView.as_view(), name='user_delete') url(r'^sistema/usuario/(?P<pk>\d+)/edit$',
EditUsuarioView.as_view(), name='user_edit'),
url(r'^sistema/usuario/(?P<pk>\d+)/delete$',
DeleteUsuarioView.as_view(), name='user_delete')
] ]
alterar_senha = [ alterar_senha = [
@ -92,8 +95,8 @@ channels_url = [
url(r'^sapl/time-refresh/$', url(r'^sapl/time-refresh/$',
base.views.time_refresh_log_test, name='time_refresh_log_test_index'), base.views.time_refresh_log_test, name='time_refresh_log_test_index'),
url(r'^app/(?P<app_backend>[^/]+)/(?P<app_frontend>[^/]+)/', url(r'^online/',
base.views.entry_point_view, name='entry_point_url'), base.views.online_app_view, name='online_app_url'),
] ]

16
sapl/base/views.py

@ -78,18 +78,9 @@ def time_refresh_log_test(request):
return render(request, 'base/time_refresh_log_test.html', {}) return render(request, 'base/time_refresh_log_test.html', {})
def entry_point_view(request, app_backend, app_frontend): def online_app_view(request):
entry_point = '{}_{}'.format(app_backend, app_frontend) return render(request, 'online_app.html')
if entry_point not in (
'sessao_online',
):
raise Http404
return render(request, 'entry_point.html', {
'entry_point': entry_point
})
def filtra_url_materias_em_tramitacao(qr, qs, campo_url, local_ou_status): def filtra_url_materias_em_tramitacao(qr, qs, campo_url, local_ou_status):
@ -1411,7 +1402,8 @@ class DeleteUsuarioView(PermissionRequiredMixin, DeleteView):
try: try:
super(DeleteUsuarioView, self).delete(request, *args, **kwargs) super(DeleteUsuarioView, self).delete(request, *args, **kwargs)
except ProtectedError as exception: except ProtectedError as exception:
error_url = reverse_lazy('sapl.base:user_delete', kwargs={'pk': self.kwargs['pk']}) error_url = reverse_lazy('sapl.base:user_delete', kwargs={
'pk': self.kwargs['pk']})
error_message = "O usuário não pode ser removido, pois é referenciado por:<br><ul>" error_message = "O usuário não pode ser removido, pois é referenciado por:<br><ul>"
for e in exception.protected_objects: for e in exception.protected_objects:

12
sapl/templates/entry_point.html

@ -1,12 +0,0 @@
{% extends "index.html" %}
{% load render_bundle from webpack_loader %}
{% block webpack_loader_css %}
{{ block.super }}
{% render_bundle entry_point 'css' %}
{% endblock %}
{% block webpack_loader_js %}
{{ block.super }}
{% render_bundle entry_point 'js' %}
{% endblock %}
Loading…
Cancel
Save