From 6774fec389740adab97509e37065f51951e09446 Mon Sep 17 00:00:00 2001
From: Leandro Roberto <leandroroberto.br@gmail.com>
Date: Sat, 16 Feb 2019 22:02:20 -0200
Subject: [PATCH] renomeia view para entry_point_view

---
 sapl/base/urls.py                                      |  4 ++--
 sapl/base/views.py                                     | 10 ++++++----
 sapl/rules/apps.py                                     |  7 +++----
 sapl/templates/{app_frontend.html => entry_point.html} |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)
 rename sapl/templates/{app_frontend.html => entry_point.html} (71%)

diff --git a/sapl/base/urls.py b/sapl/base/urls.py
index 27fb78e70..157dbd079 100644
--- a/sapl/base/urls.py
+++ b/sapl/base/urls.py
@@ -92,8 +92,8 @@ channels_url = [
     url(r'^sapl/time-refresh/$',
         base.views.time_refresh_log_test, name='time_refresh_log_test_index'),
 
-    url(r'^app/(?P<app_frontend>[^/]+)/$',
-        base.views.app_frontend_view, name='app_frontend_url'),
+    url(r'^app/(?P<app_backend>[^/]+)/(?P<app_frontend>[^/]+)/',
+        base.views.entry_point_view, name='entry_point_url'),
 
 ]
 
diff --git a/sapl/base/views.py b/sapl/base/views.py
index 97fa87d38..907e55aa9 100644
--- a/sapl/base/views.py
+++ b/sapl/base/views.py
@@ -78,15 +78,17 @@ def time_refresh_log_test(request):
     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',
     ):
         raise Http404
 
-    return render(request, 'app_frontend.html', {
-        'app_frontend': app_frontend
+    return render(request, 'entry_point.html', {
+        'entry_point': entry_point
     })
 
 
diff --git a/sapl/rules/apps.py b/sapl/rules/apps.py
index 28ff9a2b6..9ab8d1c73 100644
--- a/sapl/rules/apps.py
+++ b/sapl/rules/apps.py
@@ -3,8 +3,7 @@ import logging
 
 from asgiref.sync import async_to_sync
 from channels.layers import get_channel_layer
-import django
-from django.apps import apps
+import django.apps
 from django.contrib.auth import get_user_model
 from django.contrib.auth.management import _get_all_permissions
 from django.core import exceptions
@@ -38,7 +37,7 @@ def create_proxy_permissions(
 
     try:
         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:
         logger.error(str(e))
         return
@@ -259,7 +258,7 @@ def cria_usuarios_padrao():
 
 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':
 
         # um mensagem não deve ser enviada se é post_save mas originou se de
diff --git a/sapl/templates/app_frontend.html b/sapl/templates/entry_point.html
similarity index 71%
rename from sapl/templates/app_frontend.html
rename to sapl/templates/entry_point.html
index a19a62392..3ca8655e6 100644
--- a/sapl/templates/app_frontend.html
+++ b/sapl/templates/entry_point.html
@@ -3,10 +3,10 @@
 
 {% block webpack_loader_css %}
     {{ block.super }}
-    {% render_bundle app_frontend 'css' %}
+    {% render_bundle entry_point 'css' %}
 {% endblock %}
 
 {% block webpack_loader_js %}    
     {{ block.super }}
-    {% render_bundle app_frontend 'js' %}
+    {% render_bundle entry_point 'js' %}
 {% endblock %}