Fixed handling of orgId

public/app/core/config.ts

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

public/app/features/dashboard/services/DashboardSrv.ts

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

public/app/features/dashboard/state/initDashboard.ts

@@ -6,6 +6,7 @@ import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { AnnotationsSrv } from 'app/features/annotations/annotations_srv';
 import { AnnotationsSrv } from 'app/features/annotations/annotations_srv';
 import { VariableSrv } from 'app/features/templating/variable_srv';
 import { VariableSrv } from 'app/features/templating/variable_srv';
 import { KeybindingSrv } from 'app/core/services/keybindingSrv';
 import { KeybindingSrv } from 'app/core/services/keybindingSrv';
+import { config } from 'app/core/config';
 
 
 // Actions
 // Actions
 import { updateLocation } from 'app/core/actions';
 import { updateLocation } from 'app/core/actions';
@@ -88,7 +89,7 @@ export function initDashboard({
 
 
           if (dashboardUrl !== currentPath) {
           if (dashboardUrl !== currentPath) {
             // replace url to not create additional history items and then return so that initDashboard below isn't executed multiple times.
             // 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;
             return;
           }
           }
           break;
           break;
@@ -117,6 +118,11 @@ export function initDashboard({
       return;
       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
     // init services
     const timeSrv: TimeSrv = $injector.get('timeSrv');
     const timeSrv: TimeSrv = $injector.get('timeSrv');
     const annotationsSrv: AnnotationsSrv = $injector.get('annotationsSrv');
     const annotationsSrv: AnnotationsSrv = $injector.get('annotationsSrv');

public/app/features/templating/specs/variable_srv_init.test.ts

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

public/app/types/user.ts

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