Skip to content

Commit

Permalink
Merge branch 'access-certification' of github.com:Evolveum/midpoint i…
Browse files Browse the repository at this point in the history 
…nto access-certification
  • Loading branch information
@mederly
mederly committed Dec 16, 2015
2 parents ce37066 + 4ab0f49 commit 762622e
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 63 deletions.
8 changes: 4 additions & 4 deletions ...rc/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
View file
Expand Up @@ -58,7 +58,7 @@
<td><wicket:message key="PageCertDefinition.scopeAssignmentsInducements"/></td>
<td>
<div>
<label style="margin-right:30px;">
<label style="margin-left:30px;">
<input type="checkbox" wicket:id="includeAssignments">
<wicket:message key="PageCertDefinition.scopeIncludeAssignments"/>
</label>
Expand All @@ -73,11 +73,11 @@
<td><wicket:message key="PageCertDefinition.scopeIncludeTargetTypes"/></td>
<td>
<div>
<label style="margin-right:30px;">
<label style="margin-left:30px;">
<input type="checkbox" wicket:id="includeResources">
<wicket:message key="PageCertDefinition.scopeIncludeResources"/>
</label>
<label style="margin-right:30px;">
<label style="margin-left:30px;">
<input type="checkbox" wicket:id="includeRoles">
<wicket:message key="PageCertDefinition.scopeIncludeRoles"/>
</label>
Expand All @@ -91,7 +91,7 @@
<tr>
<td><wicket:message key="PageCertDefinition.scopeIncludeByStatus"/></td>
<td>
<label>
<label style="margin-left:30px;">
<input type="checkbox" wicket:id="includeEnabledItemsOnly">
<wicket:message key="PageCertDefinition.scopeEnabledItemsOnly"/>
</label>
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
View file
Expand Up @@ -37,7 +37,7 @@ <h3 class="box-title"><wicket:message key="PageCertDefinition.basicInformation"/
<td><wicket:message key="PageCertDefinition.description" class="col-md-4"/></td>
<td>
<div class="col-md-6">
<input type="text" class="form-control input-sm" wicket:id="description"/>
<textarea type="text" class="form-control input-sm" wicket:id="description"/>
</div>
</td>
</tr>
Expand Down
34 changes: 17 additions & 17 deletions .../src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
View file
Expand Up @@ -167,25 +167,25 @@ private void initTabs(Form mainForm) {

List<ITab> tabs = new ArrayList<>();
tabs.add(new AbstractTab(createStringResource("PageCertDefinition.scopeDefinition")) {
@Override
public WebMarkupContainer getPanel(String panelId) {
return new DefinitionScopePanel(panelId, new PropertyModel<DefinitionScopeDto>(definitionModel, CertDefinitionDto.F_SCOPE_DEFINITION));
}
});
@Override
public WebMarkupContainer getPanel(String panelId) {
return new DefinitionScopePanel(panelId, new PropertyModel<DefinitionScopeDto>(definitionModel, CertDefinitionDto.F_SCOPE_DEFINITION));
}
});
tabs.add(new AbstractTab(createStringResource("PageCertDefinition.stagesDefinition")) {
@Override
public WebMarkupContainer getPanel(String panelId) {
return new DefinitionStagesPanel(panelId, new PropertyModel<List<StageDefinitionDto>>(definitionModel, CertDefinitionDto.F_STAGE_DEFINITION));
}
});
@Override
public WebMarkupContainer getPanel(String panelId) {
return new DefinitionStagesPanel(panelId, new PropertyModel<List<StageDefinitionDto>>(definitionModel, CertDefinitionDto.F_STAGE_DEFINITION));
}
});

tabs.add(new AbstractTab(createStringResource("PageCertDefinition.campaigns")) {
@Override
public WebMarkupContainer getPanel(String panelId) {
// TODO campaigns panel (extract from PageCertCampaigns)
return new WebMarkupContainer(panelId);
}
});
@Override
public WebMarkupContainer getPanel(String panelId) {
// TODO campaigns panel (extract from PageCertCampaigns)
return new WebMarkupContainer(panelId);
}
});
tabs.add(new AbstractTab(createStringResource("PageCertDefinition.xmlDefinition")) {
@Override
public WebMarkupContainer getPanel(String panelId) {
Expand Down Expand Up @@ -235,7 +235,7 @@ public boolean isEnabled() {
});
mainForm.add(nameField);

final TextField descriptionField = new TextField(ID_DESCRIPTION, new PropertyModel<>(definitionModel, CertDefinitionDto.F_DESCRIPTION));
final TextArea descriptionField = new TextArea(ID_DESCRIPTION, new PropertyModel<>(definitionModel, CertDefinitionDto.F_DESCRIPTION));
descriptionField.add(new VisibleEnableBehaviour() {
@Override
public boolean isEnabled() {
Expand Down
57 changes: 27 additions & 30 deletions ...rc/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
View file
Expand Up @@ -40,15 +40,15 @@
<td><wicket:message key="StageDefinitionPanel.stageDuration"/></td>
<td>
<div class="col-md-6">
<textarea class="form-control input-sm" rows="2" wicket:id="description"/>
<input class="form-control input-sm" rows="2" wicket:id="duration"/>
</div>
</td>
</tr>
<tr>
<td><wicket:message key="StageDefinitionPanel.notifyBeforeDeadline"/></td>
<td>
<div class="col-md-6">
<input type="text" class="form-control input-sm" wicket:id="duration"/>
<input type="text" class="form-control input-sm" wicket:id="notifyBeforeDeadline"/>
</div>
</td>
</tr>
Expand All @@ -61,7 +61,7 @@
</td>
</tr>
<tr>
<td colspan="2"><wicket:message key="StageDefinitionPanel.reviewerSpecification"/></td>
<td colspan="2" style="font-weight:bold"><wicket:message key="StageDefinitionPanel.reviewerSpecification"/></td>
</tr>
<tr>
<td><wicket:message key="StageDefinitionPanel.reviewerName"/></td>
Expand All @@ -82,50 +82,47 @@
<tr>
<td></td>
<td>
<label style="margin-right:30px;">
<div style="margin-left:30px;">
<input type="checkbox" wicket:id="useTargetOwner">
<wicket:message key="StageDefinitionPanel.reviewerUseTargetOwner"/>
</label>
<label style="margin-right:30px;">
</div>
<div style="margin-left:30px;">
<input type="checkbox" wicket:id="useTargetApprover">
<wicket:message key="StageDefinitionPanel.reviewerUseTargetApprover"/>
</label>
</div>
</td>
</tr>
<tr>
<td></td>
<td>
<label style="margin-right:30px;">
<div style="margin-left:30px;">
<input type="checkbox" wicket:id="useObjectOwner">
<wicket:message key="StageDefinitionPanel.reviewerUseObjectOwner"/>
</label>
<label style="margin-right:30px;">
</div>
<div style="margin-left:30px;">
<input type="checkbox" wicket:id="useObjectApprover">
<wicket:message key="StageDefinitionPanel.reviewerUseObjectApprover"/>
</label>
</div>
</td>
</tr>
<tr>
<td><wicket:message key="StageDefinitionPanel.reviewerUseObjectManager"/></td>
<td>
<table>
<tr>
<td><wicket:message key="StageDefinitionPanel.reviewerUseObjectManagerOrgType"/></td>
<td>
<div class="col-md-6">
<input type="text" class="form-control input-sm" wicket:id="objectManagerOrgType"/>
</div>
</td>
</tr>
<tr>
<td><wicket:message key="StageDefinitionPanel.reviewerUseObjectManagerAllowSelf"/></td>
<td>
<label style="margin-right:30px;">
<input type="checkbox" wicket:id="useObjectManagerAllowSelf">
</label>
</td>
</tr>
</table>
<wicket:message key="StageDefinitionPanel.reviewerUseObjectManager"/>
</td>
<td>
<wicket:message key="StageDefinitionPanel.reviewerUseObjectManagerOrgType"/>
<div class="col-md-6">
<input type="text" class="form-control input-sm" wicket:id="objectManagerOrgType"/>
</div>
</td>
</tr>
<tr>
<td></td>
<td>
<div style="margin-left:30px;">
<input type="checkbox" wicket:id="useObjectManagerAllowSelf">
<wicket:message key="StageDefinitionPanel.reviewerUseObjectManagerAllowSelf"/>
</div>
</td>
</tr>
<!--<tr>-->
Expand Down
7 changes: 4 additions & 3 deletions ...om/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
View file
@@ -1,5 +1,6 @@
package com.evolveum.midpoint.web.page.admin.certification.dto;

import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationApprovalStrategyType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;

import java.io.Serializable;
Expand Down Expand Up @@ -30,7 +31,7 @@ public class AccessCertificationReviewerDto implements Serializable {
private ManagerSearchDto useObjectManager;
private List<ObjectReferenceType> defaultReviewerRef;
private List<ObjectReferenceType> additionalReviewerRef;
private String approvalStrategy;
private AccessCertificationApprovalStrategyType approvalStrategy;
public enum ApprovalStrategy {
ONE_APPROVAL_APPROVES,
ONE_DENY_DENIES,
Expand Down Expand Up @@ -110,11 +111,11 @@ public void setAdditionalReviewerRef(List<ObjectReferenceType> additionalReviewe
this.additionalReviewerRef = additionalReviewerRef;
}

public String getApprovalStrategy() {
public AccessCertificationApprovalStrategyType getApprovalStrategy() {
return approvalStrategy;
}

public void setApprovalStrategy(String approvalStrategy) {
public void setApprovalStrategy(AccessCertificationApprovalStrategyType approvalStrategy) {
this.approvalStrategy = approvalStrategy;
}
}
24 changes: 16 additions & 8 deletions ...c/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
View file
Expand Up @@ -208,13 +208,23 @@ private AccessCertificationReviewerDto createAccessCertificationReviewerDto(Acce
dto.setUseObjectOwner(Boolean.TRUE.equals(reviewer.isUseObjectOwner()));
dto.setUseObjectApprover(Boolean.TRUE.equals(reviewer.isUseObjectApprover()));
dto.setUseObjectManager(createManagerSearchDto(reviewer.getUseObjectManager()));
dto.setDefaultReviewerRef(reviewer.getDefaultReviewerRef());
dto.setAdditionalReviewerRef(reviewer.getAdditionalReviewerRef());
dto.setApprovalStrategy(reviewer.getApprovalStrategy() != null ? reviewer.getApprovalStrategy().name() : null);
dto.setDefaultReviewerRef(cloneListObjects(reviewer.getDefaultReviewerRef()));
dto.setAdditionalReviewerRef(cloneListObjects(reviewer.getAdditionalReviewerRef()));
dto.setApprovalStrategy(reviewer.getApprovalStrategy());
}
return dto;
}

private List<ObjectReferenceType> cloneListObjects(List<ObjectReferenceType> listToClone){
List<ObjectReferenceType> list = new ArrayList<>();
if (listToClone != null){
for (ObjectReferenceType objectReferenceType : listToClone){
list.add(objectReferenceType.clone());
}
}
return list;
}

public DefinitionScopeDto getScopeDefinition() {
return definitionScopeDto;
}
Expand Down Expand Up @@ -284,12 +294,10 @@ private AccessCertificationReviewerSpecificationType createAccessCertificationRe
reviewerObject.setUseObjectApprover(Boolean.TRUE.equals(reviewerDto.isUseObjectApprover()));
reviewerObject.setUseObjectManager(createManagerSearchType(reviewerDto.getUseObjectManager()));
reviewerObject.getDefaultReviewerRef().clear();
reviewerObject.getDefaultReviewerRef().addAll(reviewerDto.getDefaultReviewerRef());
reviewerObject.getDefaultReviewerRef().addAll(cloneListObjects(reviewerDto.getDefaultReviewerRef()));
reviewerObject.getAdditionalReviewerRef().clear();
reviewerObject.getAdditionalReviewerRef().addAll(reviewerDto.getAdditionalReviewerRef());
reviewerObject.setApprovalStrategy(reviewerDto.getApprovalStrategy() != null ?
AccessCertificationApprovalStrategyType.valueOf(reviewerDto.getApprovalStrategy())
: null);
reviewerObject.getAdditionalReviewerRef().addAll(cloneListObjects(reviewerDto.getAdditionalReviewerRef()));
reviewerObject.setApprovalStrategy(reviewerDto.getApprovalStrategy());
}
return reviewerObject;
}
Expand Down

0 comments on commit 762622e

Please sign in to comment.