Browse Source

renomeia view para entry_point_view

pull/2585/head
Leandro Roberto 7 years ago
parent
commit
6774fec389
  1. 4
      sapl/base/urls.py
  2. 10
      sapl/base/views.py
  3. 7
      sapl/rules/apps.py
  4. 4
      sapl/templates/entry_point.html

4
sapl/base/urls.py

@ -92,8 +92,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_frontend>[^/]+)/$', url(r'^app/(?P<app_backend>[^/]+)/(?P<app_frontend>[^/]+)/',
base.views.app_frontend_view, name='app_frontend_url'), base.views.entry_point_view, name='entry_point_url'),
] ]

10
sapl/base/views.py

@ -78,15 +78,17 @@ 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 app_frontend_view(request, app_frontend): def entry_point_view(request, app_backend, app_frontend):
if app_frontend not in ( entry_point = '{}_{}'.format(app_backend, app_frontend)
if entry_point not in (
'sessao_online', 'sessao_online',
): ):
raise Http404 raise Http404
return render(request, 'app_frontend.html', { return render(request, 'entry_point.html', {
'app_frontend': app_frontend 'entry_point': entry_point
}) })

7
sapl/rules/apps.py

@ -3,8 +3,7 @@ import logging
from asgiref.sync import async_to_sync from asgiref.sync import async_to_sync
from channels.layers import get_channel_layer from channels.layers import get_channel_layer
import django import django.apps
from django.apps import apps
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.management import _get_all_permissions from django.contrib.auth.management import _get_all_permissions
from django.core import exceptions from django.core import exceptions
@ -38,7 +37,7 @@ def create_proxy_permissions(
try: try:
logger.info("Tentando obter modelo de permissão do app.") logger.info("Tentando obter modelo de permissão do app.")
Permission = apps.get_model('auth', 'Permission') Permission = django.apps.apps.get_model('auth', 'Permission')
except LookupError as e: except LookupError as e:
logger.error(str(e)) logger.error(str(e))
return return
@ -259,7 +258,7 @@ def cria_usuarios_padrao():
def send_signal_for_websocket_time_refresh(inst, action): def send_signal_for_websocket_time_refresh(inst, action):
if hasattr(inst, '_meta') and not inst._meta.app_config.name is None and \ if hasattr(inst, '_meta') and not inst._meta.app_config is None and \
inst._meta.app_config.name[:4] == 'sapl': inst._meta.app_config.name[:4] == 'sapl':
# um mensagem não deve ser enviada se é post_save mas originou se de # um mensagem não deve ser enviada se é post_save mas originou se de

4
sapl/templates/app_frontend.html → sapl/templates/entry_point.html

@ -3,10 +3,10 @@
{% block webpack_loader_css %} {% block webpack_loader_css %}
{{ block.super }} {{ block.super }}
{% render_bundle app_frontend 'css' %} {% render_bundle entry_point 'css' %}
{% endblock %} {% endblock %}
{% block webpack_loader_js %} {% block webpack_loader_js %}
{{ block.super }} {{ block.super }}
{% render_bundle app_frontend 'js' %} {% render_bundle entry_point 'js' %}
{% endblock %} {% endblock %}
Loading…
Cancel
Save