summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Park <daniepar@cisco.com>2016-05-20 11:10:52 -0700
committerDaniel Park <daniepar@cisco.com>2016-05-20 14:44:30 -0700
commit086fc270fa41994fefe1212354c194b91c915179 (patch)
treec5c4a26f9834e263bb287f762ab897ebc8ad1248
parent313827c8ea2e0778677cfea273298fac4a19fed6 (diff)
downloaddjango_openstack_auth-086fc270fa41994fefe1212354c194b91c915179.tar.gz
Use login endpoint as key for AVAILABLE_REGIONS
The endpoint defined in request.user.endpoint may differ from the endpoint selected from Horizon's AVAILABLE_REGIONS. If so, this will result in the region appearing as 'None' in Horizon. This will use the login endpoint as the key for setting the region. Change-Id: I02d8069d2c8dcb5c24950279b1e40469072bf3bd Closes-Bug: 1494287
-rw-r--r--openstack_auth/views.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack_auth/views.py b/openstack_auth/views.py
index eb70940..2e482d7 100644
--- a/openstack_auth/views.py
+++ b/openstack_auth/views.py
@@ -115,7 +115,8 @@ def login(request, template_name=None, extra_context=None, **kwargs):
auth_user.set_session_from_user(request, request.user)
regions = dict(forms.Login.get_region_choices())
region = request.user.endpoint
- region_name = regions.get(region)
+ login_region = request.POST.get('region')
+ region_name = regions.get(login_region)
request.session['region_endpoint'] = region
request.session['region_name'] = region_name
return res