fix alerting icons on panels, #556

This commit is contained in:
Alexander Zobnin
2018-04-26 21:01:44 +03:00
parent 2083debf4a
commit 2f86730c44
3 changed files with 5 additions and 15 deletions

View File

@@ -91,13 +91,9 @@ System.register(['lodash', 'jquery', 'angular'], function (_export, _context) {
}, {
key: 'getPanelModels',
value: function getPanelModels() {
return _.flatten(_.map(this.dashboardSrv.dash.rows, function (row) {
if (row.collapse) {
return [];
} else {
return row.panels;
}
}));
return _.filter(this.dashboardSrv.dash.panels, function (panel) {
return panel.type !== 'row';
});
}
}, {
key: 'getPanelModel',

File diff suppressed because one or more lines are too long

View File

@@ -49,13 +49,7 @@ class ZabbixAlertingService {
}
getPanelModels() {
return _.flatten(_.map(this.dashboardSrv.dash.rows, row => {
if (row.collapse) {
return [];
} else {
return row.panels;
}
}));
return _.filter(this.dashboardSrv.dash.panels, panel => panel.type !== 'row');
}
getPanelModel(panelId) {