From 6c654e0f900025d811e975e96a66cd125ae6f73d Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 16 Jun 2017 16:35:20 -0400 Subject: [PATCH] (js) Fix validation in Sieve filter editor Fixes #4200 --- .../js/Preferences/FiltersDialogController.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/js/Preferences/FiltersDialogController.js b/UI/WebServerResources/js/Preferences/FiltersDialogController.js index 583e33ea4b..bc79ce5f06 100644 --- a/UI/WebServerResources/js/Preferences/FiltersDialogController.js +++ b/UI/WebServerResources/js/Preferences/FiltersDialogController.js @@ -92,8 +92,13 @@ } function hasRulesAndActions() { - return vm.filter.rules && vm.filter.rules.length > 0 && - vm.filter.actions && vm.filter.actions.length > 0; + var requirements = [ vm.filter.actions ]; + if (vm.filter.match != 'allmessages') + // When matching all messages, no rules are required + requirements.push(vm.filter.rules); + return _.every(requirements, function(a) { + return a && a.length > 0; + }); } function save(form) {