From c2ec417edca95766fff6102bbd8da89c7bc8f129 Mon Sep 17 00:00:00 2001 From: Tyr Johanson Date: Fri, 29 Jul 2016 11:08:47 -0600 Subject: [PATCH] Resource Browser links now respect webroot Use '/' in routeProvider.when()...but no leading slash when generating links. Closes-Bug: #1607882 Change-Id: I04670ddb58873a5976f1c9a1d1137823e40b8266 --- .../developer/resource-browser/resource-browser.module.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser.module.js b/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser.module.js index 106c80b5bf..286adc8530 100644 --- a/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser.module.js +++ b/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser.module.js @@ -25,7 +25,7 @@ */ angular .module('horizon.dashboard.developer.resource-browser', [], config) - .constant('horizon.dashboard.developer.resource-browser.BASE_ROUTE', '/developer/resource_browser/'); + .constant('horizon.dashboard.developer.resource-browser.BASE_ROUTE', 'developer/resource_browser/'); config.$inject = [ '$windowProvider', @@ -34,11 +34,11 @@ function config($windowProvider, $routeProvider, baseRoute) { $routeProvider - .when(baseRoute, { + .when('/' + baseRoute, { templateUrl: $windowProvider.$get().STATIC_URL + 'dashboard/developer/resource-browser/resources.html' }) - .when(baseRoute + ':resourceTypeName', { + .when('/' + baseRoute + ':resourceTypeName', { template: "" }); }