WIP: fixes after version history merge

public/app/features/dashboard/dashboard_ctrl.ts

@@ -127,6 +127,10 @@ export class DashboardCtrl {
       $scope.timezoneChanged = function() {
       $scope.timezoneChanged = function() {
         $rootScope.$broadcast("refresh");
         $rootScope.$broadcast("refresh");
       };
       };
+
+      $scope.onFolderChange = function(parentId) {
+        $scope.dashboard.parentId = parentId;
+      };
     }
     }
 
 
     init(dashboard) {
     init(dashboard) {

public/app/features/dashboard/model.ts

@@ -65,6 +65,7 @@ export class DashboardModel {
     this.version = data.version || 0;
     this.version = data.version || 0;
     this.links = data.links || [];
     this.links = data.links || [];
     this.gnetId = data.gnetId || null;
     this.gnetId = data.gnetId || null;
+    this.parentId = data.parentId || null;
 
 
     this.rows = [];
     this.rows = [];
     if (data.rows) {
     if (data.rows) {

public/app/features/dashboard/partials/settings.html

@@ -45,7 +45,7 @@
 				</div>
 				</div>
 			</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>
 
 
     <div class="section">
     <div class="section">