Преглед на файлове

[desktop] Do not show json data when auth error on main login page

Romain Rigaux преди 10 години
родител
ревизия
2b403be71e

+ 1 - 1
desktop/core/src/desktop/auth/views.py

@@ -43,7 +43,7 @@ from desktop.lib.django_util import render
 from desktop.lib.django_util import login_notrequired
 from desktop.lib.django_util import JsonResponse
 from desktop.log.access import access_warn, last_access_map
-from desktop.conf import AUTH, LDAP, OAUTH, DEMO_ENABLED
+from desktop.conf import LDAP, OAUTH, DEMO_ENABLED
 
 
 LOG = logging.getLogger(__name__)

+ 2 - 0
desktop/core/src/desktop/templates/common_footer.mako

@@ -20,7 +20,9 @@ from django.template.defaultfilters import escape, escapejs
 from desktop.views import login_modal
 %>
 
+% if request is not None:
 ${ login_modal(request).content | n,unicode }
+% endif
 
 <script type="text/javascript">
   $(document).ready(function () {

+ 1 - 1
desktop/core/src/desktop/templates/login.mako

@@ -152,4 +152,4 @@ ${ commonheader(_("Welcome to Hue"), "login", user, "50px", True) | n,unicode }
   });
 </script>
 
-${ commonfooter(request, messages) | n,unicode }
+${ commonfooter(None, messages) | n,unicode }

+ 1 - 1
desktop/core/src/desktop/views.py

@@ -47,7 +47,7 @@ from desktop.lib.i18n import smart_str
 from desktop.lib.paths import get_desktop_root
 from desktop.lib.thread_util import dump_traceback
 from desktop.log.access import access_log_level, access_warn
-from desktop.models import UserPreferences, Settings, Document2
+from desktop.models import UserPreferences, Settings
 from desktop import appmanager