IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactoring: simplified backend_srv and subUrl handling, #8122

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-04-14 19:01:08 +02:00
parent b77991f69b
commit aa47b9bf5c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/core/services/backend_srv.ts
View File

@ -66,16 +66,14 @@ export class BackendSrv {
var requestIsLocal = !options.url.match(/^http/); var requestIsLocal = !options.url.match(/^http/);
var firstAttempt = options.retry === 0; var firstAttempt = options.retry === 0;
if (requestIsLocal) { if (requestIsLocal) {
if (this.contextSrv.user && this.contextSrv.user.orgId) { if (this.contextSrv.user && this.contextSrv.user.orgId) {
options.headers = options.headers || {}; options.headers = options.headers || {};
options.headers['X-Grafana-Org-Id'] = this.contextSrv.user.orgId; options.headers['X-Grafana-Org-Id'] = this.contextSrv.user.orgId;
} }
if (!options.hasSubUrl) { if (options.url.indexOf("/") === 0) {
options.url = config.appSubUrl + options.url; options.url = options.url.substring(1);
options.hasSubUrl = true;
} }
} }
@ -142,8 +140,8 @@ export class BackendSrv {
options.headers['X-Grafana-Org-Id'] = this.contextSrv.user.orgId; options.headers['X-Grafana-Org-Id'] = this.contextSrv.user.orgId;
} }
if (!options.hasSubUrl && options.retry === 0) { if (options.url.indexOf("/") === 0) {
options.url = config.appSubUrl + options.url; options.url = options.url.substring(1);
} }
if (options.headers && options.headers.Authorization) { if (options.headers && options.headers.Authorization) {

4
public/app/plugins/panel/gettingstarted/module.ts
View File

@ -58,7 +58,7 @@ class GettingStartedPanelCtrl extends PanelCtrl {
icon: 'icon-gf icon-gf-users', icon: 'icon-gf icon-gf-users',
href: 'org/users?gettingstarted', href: 'org/users?gettingstarted',
check: () => { check: () => {
return this.backendSrv.get('api/org/users').then(res => { return this.backendSrv.get('/api/org/users').then(res => {
return res.length > 1; return res.length > 1;
}); });
} }
@ -71,7 +71,7 @@ class GettingStartedPanelCtrl extends PanelCtrl {
icon: 'icon-gf icon-gf-apps', icon: 'icon-gf icon-gf-apps',
href: 'https://grafana.com/plugins?utm_source=grafana_getting_started', href: 'https://grafana.com/plugins?utm_source=grafana_getting_started',
check: () => { check: () => {
return this.backendSrv.get('api/plugins', {embedded: 0, core: 0}).then(plugins => { return this.backendSrv.get('/api/plugins', {embedded: 0, core: 0}).then(plugins => {
return plugins.length > 0; return plugins.length > 0;
}); });
} }