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

2019-03-04 16:00:11 +03:00
parent 6449b8b255
commit c415e82ce3
1 changed files with 4 additions and 4 deletions
--- 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