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

Unsaved changes improvements: ignore row collapse state, ignore graph legend sort order, Closes #1702

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-04-02 09:44:16 +02:00
parent e6492f7db9
commit b291b18a87
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/dashboardSrv.js
View File

@@ -73,7 +73,7 @@ function (angular, $, kbn, _, moment) {
for (i = 0; i < this.rows.length; i++) {
row = this.rows[i];
for (j = 0; j < row.panels.length; j++) {
callback(row.panels[j], row);
callback(row.panels[j], j, row, i);
}
}
};

19
public/app/features/dashboard/unsavedChangesSrv.js
View File

@@ -101,6 +101,25 @@ function(angular, _, config) {
}
});
// ignore some panel and row stuff
current.forEachPanel(function(panel, panelIndex, row, rowIndex) {
var originalRow = original.rows[rowIndex];
var originalPanel = original.getPanelById(panel.id);
// ignore row collapse state
if (originalRow) {
row.collapse = originalRow.collapse;
}
if (originalPanel) {
// ignore graph legend sort
if (originalPanel.legend && panel.legend) {
delete originalPanel.legend.sortDesc;
delete originalPanel.legend.sort;
delete panel.legend.sort;
delete panel.legend.sortDesc;
}
}
});
var currentTimepicker = _.findWhere(current.nav, { type: 'timepicker' });
var originalTimepicker = _.findWhere(original.nav, { type: 'timepicker' });