openstack
/
horizon
Code Issues Proposed changes

Merge "Fix users/projects list when domain context is changed" into stable/train

This commit is contained in:
Zuul 2019-12-19 18:37:35 +00:00 committed by Gerrit Code Review
parent 720db86e71 02f4d8ab76
commit eed81df996
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/api/keystone.py
View File

@ -149,8 +149,12 @@ def keystoneclient(request, admin=False):
token_id = user.token.id
if is_multi_domain_enabled():
# Cloud Admin, Domain Admin or Mixed Domain Admin
if is_domain_admin(request):
is_domain_context_specified = bool(
request.session.get("domain_context"))
# If user is Cloud Admin, Domain Admin or Mixed Domain Admin and there
# is no domain context specified, use domain scoped token
if is_domain_admin(request) and not is_domain_context_specified:
domain_token = request.session.get('domain_token')
if domain_token:
token_id = getattr(domain_token, 'auth_token', None)