openstack
/
horizon
Code Issues Proposed changes

Merge "Define profiler constant to fix /jasmine test run"

This commit is contained in:
Jenkins 2017-03-14 09:49:44 +00:00 committed by Gerrit Code Review
parent 789007c67e 0f55a5268f
commit 4187837434
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstack_dashboard/contrib/developer/static/dashboard/developer/profiler/profiler.module.js
View File

@ -31,12 +31,20 @@
'$provide', '$provide',
'$windowProvider', '$windowProvider',
'$httpProvider', '$httpProvider',
'horizon.dashboard.developer.profiler.headers' '$injector'
]; ];
function config($provide, $windowProvider, $httpProvider, headers) { function config($provide, $windowProvider, $httpProvider, $injector) {
var path = $windowProvider.$get().STATIC_URL + 'dashboard/developer/profiler/'; var path = $windowProvider.$get().STATIC_URL + 'dashboard/developer/profiler/';
$provide.constant('horizon.dashboard.developer.profiler.basePath', path); $provide.constant('horizon.dashboard.developer.profiler.basePath', path);
// the headers constant is defined by HTML code, which doesn't exist in some
// contexts (eg. jasmine.html), so we need to handle it not being defined at all
var headers = {};
if ($injector.has('horizon.dashboard.developer.profiler.headers')) {
headers = $injector.get('horizon.dashboard.developer.profiler.headers');
}
if (Object.keys(headers).length) { if (Object.keys(headers).length) {
$httpProvider.interceptors.push(function() { $httpProvider.interceptors.push(function() {
return { return {