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

DashExport: fix View JSON in export menu

Browse Source 
ref #9002
This commit is contained in:
Daniel Lee
2017-08-30 09:56:49 +02:00
parent 54129b1340
commit abeaef71cc
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/features/dashboard/export/export_modal.ts
View File

@@ -12,13 +12,14 @@ import {DashboardExporter} from './exporter';
export class DashExportCtrl { export class DashExportCtrl {
dash: any; dash: any;
exporter: DashboardExporter; exporter: DashboardExporter;
dismiss: () => void;
/** @ngInject */ /** @ngInject */
constructor(private backendSrv, dashboardSrv, datasourceSrv, $scope) { constructor(private backendSrv, private dashboardSrv, datasourceSrv, private $scope) {
this.exporter = new DashboardExporter(datasourceSrv); this.exporter = new DashboardExporter(datasourceSrv);
this.exporter.makeExportable(dashboardSrv.getCurrent()).then(dash => { this.exporter.makeExportable(this.dashboardSrv.getCurrent()).then(dash => {
$scope.$apply(() => { this.$scope.$apply(() => {
this.dash = dash; this.dash = dash;
}); });
}); });
@@ -31,11 +32,13 @@ export class DashExportCtrl {
} }
saveJson() { saveJson() {
var html = angular.toJson(this.dash, true); var clone = this.dashboardSrv.getCurrent().getSaveModelClone();
var uri = "data:application/json," + encodeURIComponent(html);
var newWindow = window.open(uri);
}
this.$scope.$root.appEvent('show-json-editor', {
object: clone,
});
this.dismiss();
}
} }
export function dashExportDirective() { export function dashExportDirective() {
@@ -45,6 +48,7 @@ export function dashExportDirective() {
controller: DashExportCtrl, controller: DashExportCtrl,
bindToController: true, bindToController: true,
controllerAs: 'ctrl', controllerAs: 'ctrl',
scope: {dismiss: "&"}
}; };
} }

2
public/app/features/dashboard/partials/shareModal.html
View File

@@ -47,7 +47,7 @@
</script> </script>
<script type="text/ng-template" id="shareExport.html"> <script type="text/ng-template" id="shareExport.html">
<dash-export-modal></dash-export-modal> <dash-export-modal dismiss="dismiss()"></dash-export-modal>
</script> </script>
<script type="text/ng-template" id="shareLinkOptions.html"> <script type="text/ng-template" id="shareLinkOptions.html">