From a4462868699402b839c009a72e03e1e27daeb4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 16 Apr 2015 17:20:22 +0200 Subject: [PATCH] Fixed issue with unsaved changes srv being triggerd by starring / unstarring a dashboard, Fixes #1795 --- public/app/features/dashboard/unsavedChangesSrv.js | 6 +++--- .../plugins/datasource/sql/{plugin.json => plugin.json_} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename public/app/plugins/datasource/sql/{plugin.json => plugin.json_} (100%) diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index 15eb465e333..d17276dc374 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -20,13 +20,13 @@ function(angular, _, config) { $rootScope.$on("dashboard-loaded", function(event, newDashboard) { // wait for different services to patch the dashboard (missing properties) $timeout(function() { - self.original = angular.copy(newDashboard); + self.original = newDashboard.getSaveModelClone(); self.current = newDashboard; }, 1200); }); $rootScope.$on("dashboard-saved", function(event, savedDashboard) { - self.original = angular.copy(savedDashboard); + self.original = savedDashboard.getSaveModelClone(); self.current = savedDashboard; self.orignalPath = $location.path(); }); @@ -85,7 +85,7 @@ function(angular, _, config) { return false; } - var current = angular.copy(self.current); + var current = self.current.getSaveModelClone(); var original = self.original; // ignore timespan changes diff --git a/public/app/plugins/datasource/sql/plugin.json b/public/app/plugins/datasource/sql/plugin.json_ similarity index 100% rename from public/app/plugins/datasource/sql/plugin.json rename to public/app/plugins/datasource/sql/plugin.json_