From f695975f651457454bc5f6ec94455487ca12da0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 4 Feb 2019 15:02:35 +0100
Subject: [PATCH] Fixed handling of orgId

---
 public/app/core/config.ts                                 | 2 +-
 public/app/features/dashboard/services/DashboardSrv.ts    | 1 +
 public/app/features/dashboard/state/initDashboard.ts      | 8 +++++++-
 .../features/templating/specs/variable_srv_init.test.ts   | 1 -
 public/app/types/user.ts                                  | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/app/core/config.ts b/public/app/core/config.ts
index 395e40e914b..368b3798117 100644
--- a/public/app/core/config.ts
+++ b/public/app/core/config.ts
@@ -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;
diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
index 7d3dfb68cd8..532e2e1c828 100644
--- a/public/app/features/dashboard/services/DashboardSrv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -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) {
diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts
index a697a8e77f9..14d6196d69c 100644
--- a/public/app/features/dashboard/state/initDashboard.ts
+++ b/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 { 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');
diff --git a/public/app/features/templating/specs/variable_srv_init.test.ts b/public/app/features/templating/specs/variable_srv_init.test.ts
index d256ab28c2c..480b5207c17 100644
--- a/public/app/features/templating/specs/variable_srv_init.test.ts
+++ b/public/app/features/templating/specs/variable_srv_init.test.ts
@@ -25,7 +25,6 @@ describe('VariableSrv init', function(this: any) {
   };
 
   const $injector = {} as any;
-
   let ctx = {} as any;
 
   function describeInitScenario(desc, fn) {
diff --git a/public/app/types/user.ts b/public/app/types/user.ts
index 37c80074dca..365411147bb 100644
--- a/public/app/types/user.ts
+++ b/public/app/types/user.ts
@@ -1,4 +1,4 @@
-import { DashboardSearchHit } from './search';
+import { DashboardSearchHit } from './search';
 
 export interface OrgUser {
   avatarUrl: string;