Merge remote-tracking branch 'origin/support-4.4' into support-4.4

Evolveum · Oct 26, 2022 · 5a3c58e · 5a3c58e
2 parents d290a1a + 98ef43a
commit 5a3c58e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
@@ -257,6 +257,9 @@ public SearchItem addItem(ItemDefinition def) {
 
     public boolean hasAllDefinitions(List<SearchItemDefinition> definitions) {
         for (SearchItemDefinition def : definitions) {
+            if (def.getPath() == null && def.getPredefinedFilter() != null) {
+                continue;
+            }
             boolean exists = false;
             for (SearchItemDefinition existingDef : getAllDefinitions()) {
                 if (def.getPath() != null && existingDef.getPath() != null && QNameUtil.match(existingDef.getPath().lastName(), def.getPath().lastName())) {