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

1 files changed, 6 insertions, 2 deletions

diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py
index c2fdc51b2..65706bfbf 100644
--- a/openstack_dashboard/api/keystone.py
+++ b/openstack_dashboard/api/keystone.py
@@ -163,8 +163,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)