Merge "Authenticate before Authorization" into stable/train

This commit is contained in:
Zuul 2020-04-09 07:30:56 +00:00 committed by Gerrit Code Review
commit 30121e3e0a
1 changed files with 3 additions and 3 deletions

View File

@ -573,13 +573,13 @@ class Dashboard(Registry, HorizonComponent):
urlpatterns.append(
url(r'', _wrapped_include(default_panel._decorated_urls)))
# Require login if not public.
if not self.public:
_decorate_urlconf(urlpatterns, require_auth)
# Apply access controls to all views in the patterns
permissions = getattr(self, 'permissions', [])
_decorate_urlconf(urlpatterns, require_perms, permissions)
_decorate_urlconf(urlpatterns, _current_component, dashboard=self)
# Require login if not public.
if not self.public:
_decorate_urlconf(urlpatterns, require_auth)
# Return the three arguments to django.conf.urls.include
return urlpatterns, self.slug, self.slug