From 88e1fcb91090abaf1d3dc58d5982de271a666889 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 12 Jun 2017 22:51:50 +0200
Subject: [PATCH] WIP: fixes after version history merge

---
 public/app/features/dashboard/dashboard_ctrl.ts      | 4 ++++
 public/app/features/dashboard/model.ts               | 1 +
 public/app/features/dashboard/partials/settings.html | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts
index c07f84e820c..61778120506 100644
--- a/public/app/features/dashboard/dashboard_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_ctrl.ts
@@ -127,6 +127,10 @@ export class DashboardCtrl {
       $scope.timezoneChanged = function() {
         $rootScope.$broadcast("refresh");
       };
+
+      $scope.onFolderChange = function(parentId) {
+        $scope.dashboard.parentId = parentId;
+      };
     }
 
     init(dashboard) {
diff --git a/public/app/features/dashboard/model.ts b/public/app/features/dashboard/model.ts
index 90df015e104..7bf29d252c8 100644
--- a/public/app/features/dashboard/model.ts
+++ b/public/app/features/dashboard/model.ts
@@ -65,6 +65,7 @@ export class DashboardModel {
     this.version = data.version || 0;
     this.links = data.links || [];
     this.gnetId = data.gnetId || null;
+    this.parentId = data.parentId || null;
 
     this.rows = [];
     if (data.rows) {
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index 6ff00f4cf59..bb78193e3c9 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -45,7 +45,7 @@
 				</div>
 			</div>
 
-      <folder-picker ng-if="!dashboardMeta.isFolder" selected-folder="dashboard.meta.parentId" on-change="onFolderChange"></folder-picker>
+      <folder-picker ng-if="!dashboardMeta.isFolder" selected-folder="dashboardMeta.parentId" on-change="onFolderChange"></folder-picker>
 		</div>
 
     <div class="section">