openstack/horizon
Code Issues Proposed changes

Merge "Allow region override for url_for"

Browse Source
This commit is contained in:
Jenkins 2013-10-04 01:28:33 +00:00 committed by Gerrit Code Review
commit 9c08d883ea
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/api/base.py
View File

@ -247,7 +247,7 @@ def get_url_for_service(service, region, endpoint_type):
return None return None
def url_for(request, service_type, endpoint_type=None): def url_for(request, service_type, endpoint_type=None, region=None):
endpoint_type = endpoint_type or getattr(settings, endpoint_type = endpoint_type or getattr(settings,
'OPENSTACK_ENDPOINT_TYPE', 'OPENSTACK_ENDPOINT_TYPE',
'publicURL') 'publicURL')
@ -256,12 +256,14 @@ def url_for(request, service_type, endpoint_type=None):
catalog = request.user.service_catalog catalog = request.user.service_catalog
service = get_service_from_catalog(catalog, service_type) service = get_service_from_catalog(catalog, service_type)
if service: if service:
if not region:
region = request.user.services_region
url = get_url_for_service(service, url = get_url_for_service(service,
request.user.services_region, region,
endpoint_type) endpoint_type)
if not url and fallback_endpoint_type: if not url and fallback_endpoint_type:
url = get_url_for_service(service, url = get_url_for_service(service,
request.user.services_region, region,
fallback_endpoint_type) fallback_endpoint_type)
if url: if url:
return url return url