From c415e82ce3dfc27ff9c00391cb3e2975820d4567 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 4 Mar 2019 16:00:11 +0300 Subject: [PATCH] problems: fix "acknowledged" filter, closes #678, #691 --- src/panel-triggers/triggers_panel_ctrl.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/panel-triggers/triggers_panel_ctrl.js b/src/panel-triggers/triggers_panel_ctrl.js index d51ed23..6f35beb 100644 --- a/src/panel-triggers/triggers_panel_ctrl.js +++ b/src/panel-triggers/triggers_panel_ctrl.js @@ -380,12 +380,12 @@ export class TriggerPanelCtrl extends PanelCtrl { // Filter acknowledged triggers if (this.panel.showTriggers === 'unacknowledged') { triggerList = _.filter(triggerList, trigger => { - return !trigger.acknowledges; + return !(trigger.acknowledges && trigger.acknowledges.length); }); } else if (this.panel.showTriggers === 'acknowledged') { - triggerList = _.filter(triggerList, 'acknowledges'); - } else { - triggerList = triggerList; + triggerList = _.filter(triggerList, trigger => { + return trigger.acknowledges && trigger.acknowledges.length; + }); } // Filter by maintenance status