(js) Fix validation in Sieve filter editor

Fixes #4200
Alinto · Jun 16, 2017 · 6c654e0 · 6c654e0
1 parent ca43e7d
commit 6c654e0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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) {