ux: dashboard settings progress

This commit is contained in:
Torkel Ödegaard
2017-12-11 13:47:04 +01:00
parent 61dbcfd35b
commit 7f597283e8
6 changed files with 71 additions and 82 deletions

View File

@@ -62,3 +62,7 @@
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'templating'" ng-include="'public/app/features/templating/partials/editor.html'">
</div>
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'links'" >
<dash-links-editor></dash-links-editor>
</div>

View File

@@ -21,8 +21,9 @@ export class SettingsCtrl {
/** @ngInject */
constructor(private $scope, private $location, private $rootScope) {
// temp hack
this.$scope.dashboard = this.dashboard;
// temp hack for annotations and variables editors
// that rely on inherited scope
$scope.dashboard = this.dashboard;
const params = this.$location.search();
const url = $location.path();
@@ -56,6 +57,12 @@ export class SettingsCtrl {
});
});
}
onFolderChange(folder) {
this.dashboard.folderId = folder.id;
this.dashboard.meta.folderId = folder.id;
this.dashboard.meta.folderTitle= folder.title;
}
}
export function dashboardSettings() {