diff --git a/sapl/base/urls.py b/sapl/base/urls.py index 157dbd079..5081934e6 100644 --- a/sapl/base/urls.py +++ b/sapl/base/urls.py @@ -43,9 +43,12 @@ app_name = AppConfig.name admin_user = [ url(r'^sistema/usuario/$', PesquisarUsuarioView.as_view(), name='usuario'), - url(r'^sistema/usuario/create$', CreateUsuarioView.as_view(), name='user_create'), - url(r'^sistema/usuario/(?P\d+)/edit$', EditUsuarioView.as_view(), name='user_edit'), - url(r'^sistema/usuario/(?P\d+)/delete$', DeleteUsuarioView.as_view(), name='user_delete') + url(r'^sistema/usuario/create$', + CreateUsuarioView.as_view(), name='user_create'), + url(r'^sistema/usuario/(?P\d+)/edit$', + EditUsuarioView.as_view(), name='user_edit'), + url(r'^sistema/usuario/(?P\d+)/delete$', + DeleteUsuarioView.as_view(), name='user_delete') ] alterar_senha = [ @@ -92,8 +95,8 @@ channels_url = [ url(r'^sapl/time-refresh/$', base.views.time_refresh_log_test, name='time_refresh_log_test_index'), - url(r'^app/(?P[^/]+)/(?P[^/]+)/', - base.views.entry_point_view, name='entry_point_url'), + url(r'^online/', + base.views.online_app_view, name='online_app_url'), ] diff --git a/sapl/base/views.py b/sapl/base/views.py index 907e55aa9..b1333ed3c 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -78,18 +78,9 @@ def time_refresh_log_test(request): 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) - - if entry_point not in ( - 'sessao_online', - ): - raise Http404 - - return render(request, 'entry_point.html', { - 'entry_point': entry_point - }) + return render(request, 'online_app.html') def filtra_url_materias_em_tramitacao(qr, qs, campo_url, local_ou_status): @@ -1334,9 +1325,9 @@ class PesquisarUsuarioView(PermissionRequiredMixin, FilterView): context['page_range'] = make_pagination( page_obj.number, paginator.num_pages) - + context['NO_ENTRIES_MSG'] = 'Nenhum usuário encontrado!' - + context['title'] = _('Usuários') return context @@ -1405,13 +1396,14 @@ class DeleteUsuarioView(PermissionRequiredMixin, DeleteView): template_name = "crud/confirm_delete.html" permission_required = ('base.delete_appconfig',) success_url = reverse_lazy('sapl.base:usuario') - success_message = "Usuário removido com sucesso!" + success_message = "Usuário removido com sucesso!" - def delete(self, request, *args, **kwargs): + def delete(self, request, *args, **kwargs): try: super(DeleteUsuarioView, self).delete(request, *args, **kwargs) 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:
    " for e in exception.protected_objects: @@ -1428,7 +1420,7 @@ class DeleteUsuarioView(PermissionRequiredMixin, DeleteView): @property def cancel_url(self): return reverse('sapl.base:user_edit', - kwargs={'pk': self.kwargs['pk']}) + kwargs={'pk': self.kwargs['pk']}) class EditUsuarioView(PermissionRequiredMixin, UpdateView): diff --git a/sapl/templates/entry_point.html b/sapl/templates/entry_point.html deleted file mode 100644 index 3ca8655e6..000000000 --- a/sapl/templates/entry_point.html +++ /dev/null @@ -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 %}