Skip to content

Commit

Permalink
Merge branch 'support-3.8' of https://github.com/Evolveum/midpoint in…
Browse files Browse the repository at this point in the history 
…to support-3.8
  • Loading branch information
@katkav
katkav committed Sep 21, 2018
2 parents a41af05 + 6310689 commit ba2c50f
Show file tree
Hide file tree
Showing 31 changed files with 1,151 additions and 873 deletions.
4 changes: 2 additions & 2 deletions ...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html
View file
Expand Up @@ -19,8 +19,8 @@
<wicket:panel>
<span wicket:id="linkContainer" class="col-md-11"><span wicket:id="passwordSet"/><span wicket:id="passwordRemove"/> <span class="btn-group" style="float:right"><a href="#" wicket:id="changePasswordLink" class="btn btn-primary btn-xs"></a></span></span>
<div wicket:id="inputContainer" class="col-md-11">
<input class="form-control input-sm" wicket:id="password1" type="password" autocomplete="new-password" about="password1"/>
<input class="form-control input-sm" wicket:id="password2" type="password" autocomplete="new-password" style="margin-top: 5px;" about="password2"/>
<input class="form-control input-sm" wicket:id="password1" wicket:message="placeholder:PasswordPanel.passwordPlaceholder" type="password" autocomplete="new-password" about="password1"/>
<input class="form-control input-sm" wicket:id="password2" wicket:message="placeholder:PasswordPanel.repeatPasswordPlaceholder" type="password" autocomplete="new-password" style="margin-top: 5px;" about="password2"/>
</div>
<div wicket:id="removeButtonContainer" class="col-md-1"><span class="btn-group" style="float:right"><a href="#" wicket:id="removePasswordLink" class="btn btn-primary btn-xs"></a></span></div>
</wicket:panel>
Expand Down
18 changes: 9 additions & 9 deletions ...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
View file
Expand Up @@ -37,16 +37,16 @@
</div>
</div>
<div wicket:id="details">
<div wicket:id="assignmentsDetails">
<div wicket:id="assignmentDetails" />
</div>

<div class="row">
<div class="container-fluid prism-container">
<div class="btn btn-default" wicket:id="cancelButton"/>
<div class="btn btn-primary" wicket:id="doneButton"/>
<div wicket:id="assignmentsDetails">
<div wicket:id="assignmentDetails" />
</div>

<div class="row">
<div class="container-fluid prism-container">
<div class="btn btn-default" wicket:id="cancelButton"/>
<div class="btn btn-primary" wicket:id="doneButton"/>
</div>
</div>
</div>
</div>
</wicket:panel>
</html>
13 changes: 7 additions & 6 deletions ...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
View file
Expand Up @@ -374,11 +374,11 @@ public static QName getTargetType(AssignmentType assignment) {

}

public static IModel<String> getShoppingCartAssignmentsLimitReachedTitleModel(OperationResult result, PageBase pageBase){
public static IModel<String> getShoppingCartAssignmentsLimitReachedTitleModel(PageBase pageBase){
return new LoadableModel<String>(true) {
@Override
protected String load() {
int assignmentsLimit = loadAssignmentsLimit(result, pageBase);
int assignmentsLimit = pageBase.getSessionStorage().getRoleCatalog().getAssignmentRequestLimit();
return isShoppingCartAssignmentsLimitReached(assignmentsLimit, pageBase) ?
pageBase.createStringResource("RoleCatalogItemButton.assignmentsLimitReachedTitle", assignmentsLimit)
.getString() : "";
Expand All @@ -394,11 +394,12 @@ public static boolean isShoppingCartAssignmentsLimitReached(int assignmentsLimit
public static int loadAssignmentsLimit(OperationResult result, PageBase pageBase){
int assignmentsLimit = -1;
try {
SystemConfigurationType sysConfig = pageBase.getModelInteractionService().getSystemConfiguration(result);
if (sysConfig != null && sysConfig.getAdminGuiConfiguration() != null && sysConfig.getAdminGuiConfiguration().getRoleManagement() != null){
assignmentsLimit = sysConfig.getAdminGuiConfiguration().getRoleManagement().getAssignmentApprovalRequestLimit();
AdminGuiConfigurationType adminGuiConfig = pageBase.getModelInteractionService().getAdminGuiConfiguration(
pageBase.createSimpleTask(result.getOperation()), result);
if (adminGuiConfig != null && adminGuiConfig.getRoleManagement() != null) {
assignmentsLimit = adminGuiConfig.getRoleManagement().getAssignmentApprovalRequestLimit();
}
} catch (ObjectNotFoundException | SchemaException ex){
} catch (ObjectNotFoundException | SchemaException ex) {
LOGGER.error("Error getting system configuration: {}", ex.getMessage(), ex);
}
return assignmentsLimit;
Expand Down
4 changes: 2 additions & 2 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html
View file
Expand Up @@ -33,11 +33,11 @@
style="position: absolute; top: 3px; right: 3px; font-size: 20px;"></i>
</div>
<div class="shopping-cart-item-box-footer">
<span wicket:id="detailsLink" class="shopping-cart-item-button-details">
<span wicket:id="detailsLink">
<span wicket:id="detailsLinkLabel"/>
<i wicket:id="detailsLinkIcon" class="fa fa-arrow-circle-right"/>
</span>
<span wicket:id="addToCartLink" class="shopping-cart-item-button-add">
<span wicket:id="addToCartLink">
<wicket:message key="MultiButtonPanel.addToCartLink"/>
<i wicket:id="addToCartLinkIcon" class="fa fa-plus-circle" style="margin-left: 10px;"/>
</span>
Expand Down
26 changes: 20 additions & 6 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
View file
Expand Up @@ -69,7 +69,6 @@ public class RoleCatalogItemButton extends BasePanel<AssignmentEditorDto>{

private static final String DOT_CLASS = RoleCatalogItemButton.class.getName() + ".";
private static final String OPERATION_LOAD_OBJECT = DOT_CLASS + "loadObject";
private static final String OPERATION_LOAD_ASSIGNMENTS_LIMIT = DOT_CLASS + "loadAssignmentsLimit";
private static final Trace LOGGER = TraceManager.getTrace(RoleCatalogItemButton.class);

public RoleCatalogItemButton(String id, IModel<AssignmentEditorDto> model){
Expand Down Expand Up @@ -127,7 +126,13 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
};
detailsLink.add(getFooterLinksEnableBehaviour());
detailsLink.add(AttributeAppender.append("title",
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), getPageBase())));
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(getPageBase())));
detailsLink.add(AttributeAppender.append("class", new LoadableModel<String>() {
@Override
protected String load() {
return detailsLink.isEnabled() ? "shopping-cart-item-button-details" : "shopping-cart-item-button-details-disabled";
}
}));
itemButtonContainer.add(detailsLink);

Label detailsLinkLabel = new Label(ID_DETAILS_LINK_LABEL, createStringResource("MultiButtonPanel.detailsLink"));
Expand Down Expand Up @@ -155,7 +160,13 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
};
addToCartLink.add(getFooterLinksEnableBehaviour());
addToCartLink.add(AttributeAppender.append("title",
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), getPageBase())));
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(getPageBase())));
addToCartLink.add(AttributeAppender.append("class", new LoadableModel<String>() {
@Override
protected String load() {
return addToCartLink.isEnabled() ? "shopping-cart-item-button-add" : "shopping-cart-item-button-add-disabled";
}
}));
itemButtonContainer.add(addToCartLink);

AjaxLink addToCartLinkIcon = new AjaxLink(ID_ADD_TO_CART_LINK_ICON) {
Expand Down Expand Up @@ -232,8 +243,7 @@ private VisibleEnableBehaviour getFooterLinksEnableBehaviour(){

@Override
public boolean isEnabled(){
int assignmentsLimit = AssignmentsUtil.loadAssignmentsLimit(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT),
RoleCatalogItemButton.this.getPageBase());
int assignmentsLimit = getRoleCatalogStorage().getAssignmentRequestLimit();
return !AssignmentsUtil.isShoppingCartAssignmentsLimitReached(assignmentsLimit, RoleCatalogItemButton.this.getPageBase())
&& (isMultiUserRequest() || canAssign(getModelObject()));
}
Expand Down Expand Up @@ -280,7 +290,11 @@ private void targetObjectDetailsPerformed(AssignmentEditorDto assignment, AjaxRe
}

private boolean isMultiUserRequest(){
return getPageBase().getSessionStorage().getRoleCatalog().isMultiUserRequest();
return getRoleCatalogStorage().isMultiUserRequest();
}

private RoleCatalogStorage getRoleCatalogStorage(){
return getPageBase().getSessionStorage().getRoleCatalog();
}

private boolean canAssign(AssignmentEditorDto assignment) {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html
View file
Expand Up @@ -32,7 +32,7 @@
<a class="btn btn-info" wicket:id="previewChanges"/>
<a class="btn btn-primary" wicket:id="save"/>
<span wicket:id="shoppingCartButtonsPanel" style="margin-left: 20px;">
<a class="btn btn-success" wicket:id="addToCartButton">
<a wicket:id="addToCartButton">
<i class="fa fa-plus-circle" style="margin-left: 10px;"/>
</a>
<a wicket:id="shoppingCartButton" >
Expand Down
8 changes: 7 additions & 1 deletion ...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
View file
Expand Up @@ -120,6 +120,12 @@ public void onClick(AjaxRequestTarget target) {
target.add(shoppingCartButtonsPanel);
}
};
addToCartButton.add(AttributeAppender.append("class", new LoadableModel<String>() {
@Override
protected String load() {
return addToCartButton.isEnabled() ? "btn btn-success" : "btn btn-success disabled";
}
}));
addToCartButton.setOutputMarkupId(true);
addToCartButton.add(new VisibleEnableBehaviour(){
private static final long serialVersionUID = 1L;
Expand All @@ -135,7 +141,7 @@ public boolean isEnabled(){
}
});
addToCartButton.add(AttributeAppender.append("title",
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), parentPage)));
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(parentPage)));

shoppingCartButtonsPanel.add(addToCartButton);

Expand Down
34 changes: 1 addition & 33 deletions ...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
View file
Expand Up @@ -19,39 +19,7 @@
<body>
<wicket:extend>
<form wicket:id="mainForm" class="form-horizontal">
<div class="row" style="padding-bottom: 20px">
<div class="col-md-6">
<div wicket:id="primaryDeltas"/>
</div>
<div class="col-md-6">
<div wicket:id="secondaryDeltas"/>
</div>
</div>
<div class="row" wicket:id="policyViolationsContainer">
<div class="col-md-12">
<div class="box box-danger">
<div class="box-header">
<h3 class="box-title"><wicket:message key="PagePreviewChanges.policyViolationMessages"/></h3>
</div>
<div class="box-body">
<div wicket:id="policyViolations"/>
</div>
</div>
</div>
</div>
<div class="row" wicket:id="approvalsContainer">
<div class="col-md-12">
<div class="box box-warning">
<div class="box-header">
<h3 class="box-title"><wicket:message key="PagePreviewChanges.approvalsRequired"/></h3>
</div>
<div class="box-body">
<div wicket:id="approvals"/>
</div>
</div>
</div>
</div>

<div wicket:id="tabbedPanel" class="nav-tabs-custom" />
<div class="main-button-bar">
<a class="btn btn-default" wicket:id="continueEditing" />
<a class="btn btn-primary" wicket:id="save" />
Expand Down

0 comments on commit ba2c50f

Please sign in to comment.