openstack
/
horizon
Code Issues Proposed changes

Merge "Make domain_lookup return consistent type"

This commit is contained in:
Zuul 2019-03-18 18:40:23 +00:00 committed by Gerrit Code Review
parent 8b4d702a84 8e13106adb
commit 4837656b32
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/api/keystone.py
View File

@ -247,7 +247,7 @@ def domain_lookup(request):
return dict((d.id, d.name) for d in domains) return dict((d.id, d.name) for d in domains)
except Exception: except Exception:
LOG.warning("Pure project admin doesn't have a domain token") LOG.warning("Pure project admin doesn't have a domain token")
return None return {}
else: else:
domain = get_default_domain(request) domain = get_default_domain(request)
return {domain.id: domain.name} return {domain.id: domain.name}