From 4c3e1f7cfaebc3a61e9ba5b43c545266a4b30af0 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Thu, 23 Mar 2017 16:32:45 +0100 Subject: [PATCH] includeUsers in cert campaign definition DTO --- .../page/admin/certification/dto/CertDefinitionDto.java | 2 ++ .../page/admin/certification/dto/DefinitionScopeDto.java | 9 +++++++++ .../handlers/DirectAssignmentCertificationHandler.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java index 611268d9c63..ad19157470f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java @@ -248,6 +248,7 @@ private DefinitionScopeDto createDefinitionScopeDto(AccessCertificationScopeType dto.setIncludeRoles(!Boolean.FALSE.equals(assignmentScope.isIncludeRoles())); dto.setIncludeOrgs(!Boolean.FALSE.equals(assignmentScope.isIncludeOrgs())); dto.setIncludeServices(!Boolean.FALSE.equals(assignmentScope.isIncludeServices())); + dto.setIncludeUsers(!Boolean.FALSE.equals(assignmentScope.isIncludeUsers())); dto.setEnabledItemsOnly(!Boolean.FALSE.equals(assignmentScope.isEnabledItemsOnly())); dto.setRelationList(new ArrayList<>(assignmentScope.getRelation())); } @@ -301,6 +302,7 @@ public void updateScopeDefinition(PrismContext prismContext) { scopeTypeObj.setIncludeRoles(definitionScopeDto.isIncludeRoles()); scopeTypeObj.setIncludeOrgs(definitionScopeDto.isIncludeOrgs()); scopeTypeObj.setIncludeServices(definitionScopeDto.isIncludeServices()); + scopeTypeObj.setIncludeUsers(definitionScopeDto.isIncludeUsers()); scopeTypeObj.setEnabledItemsOnly(definitionScopeDto.isEnabledItemsOnly()); scopeTypeObj.setItemSelectionExpression(definitionScopeDto.getItemSelectionExpression()); scopeTypeObj.getRelation().addAll(definitionScopeDto.getRelationList()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java index f00bc3b177a..b0f319398fe 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java @@ -54,6 +54,7 @@ public class DefinitionScopeDto implements Serializable { private boolean includeRoles; private boolean includeOrgs; private boolean includeServices; + private boolean includeUsers; private boolean enabledItemsOnly; private ExpressionType itemSelectionExpression; private List relationList; @@ -167,6 +168,14 @@ public void setIncludeServices(boolean includeServices) { this.includeServices = includeServices; } + public boolean isIncludeUsers() { + return includeUsers; + } + + public void setIncludeUsers(boolean includeUsers) { + this.includeUsers = includeUsers; + } + public boolean isEnabledItemsOnly() { return enabledItemsOnly; } diff --git a/model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java b/model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java index 61df898ba2b..ee4d6b9c2c0 100644 --- a/model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java +++ b/model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java @@ -179,7 +179,7 @@ private boolean isIncludeServices(AccessCertificationAssignmentReviewScopeType s } private boolean isIncludeUsers(AccessCertificationAssignmentReviewScopeType scope) { - return scope == null || !Boolean.FALSE.equals(scope.isIncludeServices()); + return scope == null || !Boolean.FALSE.equals(scope.isIncludeUsers()); } private boolean isEnabledItemsOnly(AccessCertificationAssignmentReviewScopeType scope) {