includeUsers in cert campaign definition DTO

Evolveum · Mar 23, 2017 · 4c3e1f7 · 4c3e1f7
1 parent 48eb52e
commit 4c3e1f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java b/...c/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/.../main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java b/.../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<QName> 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/...m/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java b/...m/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) {