IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

PR comments

Browse Source
This commit is contained in:
Andrzej Ressel 2018-04-11 22:59:29 +02:00
parent dc11f1da81
commit bff174dba9
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/dashboard/settings/settings.html
View File

@ -87,12 +87,16 @@
<gf-dashboard-history dashboard="dashboard"></gf-dashboard-history>
</div>
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'view_json'" >
<h3 class="dashboard-settings__header">View JSON</h3>
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'dashboard_json'" >
<h3 class="dashboard-settings__header">Dashboard JSON</h3>
<div class="gf-form">
<code-editor content="ctrl.json" data-mode="json" data-max-lines=30 ></code-editor>
</div>
<button class="btn btn-success dashboard-settings__json-save-button" ng-click="ctrl.saveDashboardJson()" ng-show="ctrl.canSave">
<i class="fa fa-save"></i> Save JSON
</button>
</div>
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'permissions'" >

27
public/app/features/dashboard/settings/settings.ts
View File

@ -17,7 +17,14 @@ export class SettingsCtrl {
hasUnsavedFolderChange: boolean;
/** @ngInject */
constructor(private $scope, private $location, private $rootScope, private backendSrv, private dashboardSrv) {
constructor(
private $scope,
private $route,
private $location,
private $rootScope,
private backendSrv,
private dashboardSrv
) {
// temp hack for annotations and variables editors
// that rely on inherited scope
$scope.dashboard = this.dashboard;
@ -93,8 +100,8 @@ export class SettingsCtrl {
}
this.sections.push({
title: 'View JSON',
id: 'view_json',
title: 'Dashboard JSON',
id: 'dashboard_json',
icon: 'gicon gicon-json',
});
@ -134,13 +141,13 @@ export class SettingsCtrl {
}
saveDashboard() {
if (this.viewId === 'view_json') {
this.dashboardSrv.saveJSONDashboard(this.json).then(() => {
window.location.reload();
});
} else {
this.dashboardSrv.saveDashboard();
}
this.dashboardSrv.saveDashboard();
}
saveDashboardJson() {
this.dashboardSrv.saveJSONDashboard(this.json).then(() => {
this.$route.reload();
});
}
onPostSave() {

4
public/sass/components/_dashboard_settings.scss
View File

@ -80,3 +80,7 @@
margin-bottom: 10px;
}
}
.dashboard-settings__json-save-button {
margin-top: $spacer;
}