From 241d0bfedbb406652b04d71e3b92227a160850db Mon Sep 17 00:00:00 2001
From: Hiroyuki Wada <h2-wada@nri.co.jp>
Date: Thu, 4 Jun 2020 12:02:02 +0900
Subject: [PATCH] MID-6306 Fix assignable roles filter when the requester
 doesn't have assignment permission for the target user(s)

---
 .../midpoint/web/page/self/AbstractShoppingCartTabPanel.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
index e20c1c0ed07..dc5e03a62bc 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
@@ -11,13 +11,11 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.query.NoneFilter;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -444,7 +442,7 @@ protected ObjectQuery createContentQuery() {
                 .type(getQueryClass())
                 .build();
         ObjectFilter assignableRolesFilter = getAssignableRolesFilter();
-        if (assignableRolesFilter != null && !(assignableRolesFilter instanceof NoneFilter)){
+        if (assignableRolesFilter != null) {
             memberQuery.addFilter(assignableRolesFilter);
         }
 //        if (getQueryType() != null && !AbstractRoleType.COMPLEX_TYPE.equals(getQueryType())){