From be34417b3aa85c5eddfcff044ecd3df38c56c905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 29 May 2018 14:02:52 +0200
Subject: [PATCH] fix: refactoring PR #11996 and fixing issue #11551
 16706hashkey in json editors

---
 public/app/features/annotations/editor_ctrl.ts          | 4 ++++
 public/app/features/annotations/partials/editor.html    | 4 ++--
 public/app/features/dashboard/save_provisioned_modal.ts | 2 +-
 public/app/features/dashboard/settings/settings.ts      | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/app/features/annotations/editor_ctrl.ts b/public/app/features/annotations/editor_ctrl.ts
index 169e2e4c2bb..34b9635ec85 100644
--- a/public/app/features/annotations/editor_ctrl.ts
+++ b/public/app/features/annotations/editor_ctrl.ts
@@ -70,6 +70,10 @@ export class AnnotationsEditorCtrl {
     this.mode = 'list';
   }
 
+  move(index, dir) {
+    _.move(this.annotations, index, index + dir);
+  }
+
   add() {
     this.annotations.push(this.currentAnnotation);
     this.reset();
diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index e1410ad0fea..65ee7e52bd0 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -33,8 +33,8 @@
 					<td class="pointer" ng-click="ctrl.edit(annotation)">
 						{{annotation.datasource || 'Default'}}
 					</td>
-					<td style="width: 1%"><i ng-click="_.move(ctrl.annotations,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
-					<td style="width: 1%"><i ng-click="_.move(ctrl.annotations,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
+					<td style="width: 1%"><i ng-click="ctrl.move($index,-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
+					<td style="width: 1%"><i ng-click="ctrl.move($index,1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
 					<td style="width: 1%">
 						<a ng-click="ctrl.removeAnnotation(annotation)" class="btn btn-danger btn-mini" ng-hide="annotation.builtIn">
 							<i class="fa fa-remove"></i>
diff --git a/public/app/features/dashboard/save_provisioned_modal.ts b/public/app/features/dashboard/save_provisioned_modal.ts
index ba96ce0b0b9..3f2dcd0f57b 100644
--- a/public/app/features/dashboard/save_provisioned_modal.ts
+++ b/public/app/features/dashboard/save_provisioned_modal.ts
@@ -48,7 +48,7 @@ export class SaveProvisionedDashboardModalCtrl {
   constructor(dashboardSrv) {
     this.dash = dashboardSrv.getCurrent().getSaveModelClone();
     delete this.dash.id;
-    this.dashboardJson = JSON.stringify(this.dash, null, 2);
+    this.dashboardJson = angular.toJson(this.dash, true);
   }
 
   save() {
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts
index 5acbbcf29c5..457cac5af72 100755
--- a/public/app/features/dashboard/settings/settings.ts
+++ b/public/app/features/dashboard/settings/settings.ts
@@ -2,6 +2,7 @@ import { coreModule, appEvents, contextSrv } from 'app/core/core';
 import { DashboardModel } from '../dashboard_model';
 import $ from 'jquery';
 import _ from 'lodash';
+import angular from 'angular';
 import config from 'app/core/config';
 
 export class SettingsCtrl {
@@ -118,7 +119,7 @@ export class SettingsCtrl {
     this.viewId = this.$location.search().editview;
 
     if (this.viewId) {
-      this.json = JSON.stringify(this.dashboard.getSaveModelClone(), null, 2);
+      this.json = angular.toJson(this.dashboard.getSaveModelClone(), true);
     }
 
     if (this.viewId === 'settings' && this.dashboard.meta.canMakeEditable) {