openstack/horizon
Code Issues Proposed changes

Merge "Use absUrl, so WEBROOT isn't ignored on redirect"

Browse Source
This commit is contained in:
Jenkins 2016-07-07 00:24:55 +00:00 committed by Gerrit Code Review
commit fd64d61258
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/static/app/redirect.controller.js
View File

@ -44,7 +44,7 @@
waitSpinnerService
) {
waitSpinnerService.showModalSpinner(gettext('Loading'));
$window.location.href = $location.path();
$window.location.href = $location.absUrl();
}
}());

3
openstack_dashboard/static/app/redirect.controller.spec.js
View File

@ -32,7 +32,8 @@
controller = $injector.get('$controller');
waitSpinnerService = $injector.get('horizon.framework.widgets.modal-wait-spinner.service');
spyOn($location, 'path').and.returnValue('path');
// NOTE: This is using absUrl, so requests will already include WEBROOT.
spyOn($location, 'absUrl').and.returnValue('path');
});
});