problems: fix "acknowledged" filter, closes #678, #691

This commit is contained in:
Alexander Zobnin
2019-03-04 16:00:11 +03:00
parent 6449b8b255
commit c415e82ce3

View File

@@ -380,12 +380,12 @@ export class TriggerPanelCtrl extends PanelCtrl {
// Filter acknowledged triggers // Filter acknowledged triggers
if (this.panel.showTriggers === 'unacknowledged') { if (this.panel.showTriggers === 'unacknowledged') {
triggerList = _.filter(triggerList, trigger => { triggerList = _.filter(triggerList, trigger => {
return !trigger.acknowledges; return !(trigger.acknowledges && trigger.acknowledges.length);
}); });
} else if (this.panel.showTriggers === 'acknowledged') { } else if (this.panel.showTriggers === 'acknowledged') {
triggerList = _.filter(triggerList, 'acknowledges'); triggerList = _.filter(triggerList, trigger => {
} else { return trigger.acknowledges && trigger.acknowledges.length;
triggerList = triggerList; });
} }
// Filter by maintenance status // Filter by maintenance status