IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed handling of orgId

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-02-04 15:02:35 +01:00
parent 7634e04231
commit f695975f65
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/config.ts
View File

@ -68,5 +68,5 @@ const bootData = (window as any).grafanaBootData || {
const options = bootData.settings;
options.bootData = bootData;
const config = new Settings(options);
export const config = new Settings(options);
export default config;

1
public/app/features/dashboard/services/DashboardSrv.ts
View File

@ -9,6 +9,7 @@ export class DashboardSrv {
/** @ngInject */
constructor(private backendSrv, private $rootScope, private $location) {
appEvents.on('save-dashboard', this.saveDashboard.bind(this), $rootScope);
appEvents.on('save-dashboard', this.saveDashboard.bind(this), $rootScope);
}
create(dashboard, meta) {

8
public/app/features/dashboard/state/initDashboard.ts
View File

@ -6,6 +6,7 @@ import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
import { AnnotationsSrv } from 'app/features/annotations/annotations_srv';
import { VariableSrv } from 'app/features/templating/variable_srv';
import { KeybindingSrv } from 'app/core/services/keybindingSrv';
import { config } from 'app/core/config';
// Actions
import { updateLocation } from 'app/core/actions';
@ -88,7 +89,7 @@ export function initDashboard({
if (dashboardUrl !== currentPath) {
// replace url to not create additional history items and then return so that initDashboard below isn't executed multiple times.
dispatch(updateLocation({path: dashboardUrl, partial: true, replace: true}));
dispatch(updateLocation({ path: dashboardUrl, partial: true, replace: true }));
return;
}
break;
@ -117,6 +118,11 @@ export function initDashboard({
return;
}
// add missing orgId query param
if (!getState().location.query.orgId) {
dispatch(updateLocation({ query: { orgId: config.bootData.user.orgId }, partial: true, replace: true }));
}
// init services
const timeSrv: TimeSrv = $injector.get('timeSrv');
const annotationsSrv: AnnotationsSrv = $injector.get('annotationsSrv');

1
public/app/features/templating/specs/variable_srv_init.test.ts
View File

@ -25,7 +25,6 @@ describe('VariableSrv init', function(this: any) {
};
const $injector = {} as any;
let ctx = {} as any;
function describeInitScenario(desc, fn) {

2
public/app/types/user.ts
View File

@ -1,4 +1,4 @@
import { DashboardSearchHit } from './search';
import { DashboardSearchHit } from './search';
export interface OrgUser {
avatarUrl: string;