Skip to content

Commit

Permalink
MID-6306 Fix assignable roles filter when the requester doesn't have
Browse files Browse the repository at this point in the history
assignment permission for the target user(s)
  • Loading branch information
wadahiro authored and KaterynaHonchar committed Jun 10, 2020
1 parent a526085 commit 09d47a6
Showing 1 changed file with 1 addition and 3 deletions.
Expand Up @@ -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;
Expand Down Expand Up @@ -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())){
Expand Down

0 comments on commit 09d47a6

Please sign in to comment.