Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Aug 24, 2018
2 parents 0c1b075 + d954be6 commit 4b6b651
Show file tree
Hide file tree
Showing 179 changed files with 7,765 additions and 3,777 deletions.
4 changes: 2 additions & 2 deletions build-system/pom.xml
View file
Expand Up @@ -83,7 +83,7 @@
<activiti-spring.version>5.22.0</activiti-spring.version>
<commons-email.version>1.3</commons-email.version>
<xmlsec.version>2.0.6</xmlsec.version>
<connid.version>1.4.3.11</connid.version>
<connid.version>1.4.3.41</connid.version>
<jasper.version>6.5.0</jasper.version>
<derby.version>10.11.1.1</derby.version>
<wro4j.version>1.8.0</wro4j.version>
Expand Down Expand Up @@ -698,7 +698,7 @@
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-ldap</artifactId>
<version>1.6</version>
<version>2.0-M1</version>
<exclusions>
<exclusion> <!-- Version in dependency of org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j conflicts with xalan. Can be removed when connector version is bumped beyond 1.4.2.17 -->
<groupId>xml-apis</groupId>
Expand Down
33 changes: 0 additions & 33 deletions ...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
View file
Expand Up @@ -33,38 +33,5 @@
<div wicket:id="specificContainers" />
</wicket:fragment>
</wicket:panel>

<!-- <wicket:panel>

<div wicket:id="items" class="main-form-panel">
<div class="row">
<div wicket:id="relationContainer" class="col-xs-6">
<label class="col-xs-2 prism-property" ><wicket:message key="AbstractRoleAssignmentPanel.relationLabel" /></label>
<div class="col-xs-3" wicket:id="relation" />
</div>
<div class="col-xs-3 pull-right">
<div class="btn btn-default pull-right" wicket:id="showAllAssignmentsButton" />
</div>
</div>
<div class="row" >
<div class="col-md-12" wicket:id="itemsTable" style="margin: 5px 0;"/>
</div>
<div>
<div class="btn btn-success btn-sm" wicket:id="newItemButton"/>
</div>
</div>
<div wicket:id="details">
<div wicket:id="itemsDetails">
<div wicket:id="itemDetails" />
</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>
</wicket:panel> -->
</html>
8 changes: 4 additions & 4 deletions ...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
View file
Expand Up @@ -387,13 +387,13 @@ 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);
return isShoppingCartAssignmentsLimitReached(assignmentsLimit, pageBase) ?
pageBase.createStringResource("RoleCatalogItemButton.assignmentsLimitReachedTitle", loadAssignmentsLimit(result, pageBase))
int assignmentsLimit = pageBase.getSessionStorage().getRoleCatalog().getAssignmentRequestLimit();
return isShoppingCartAssignmentsLimitReached(assignmentsLimit, pageBase) ?
pageBase.createStringResource("RoleCatalogItemButton.assignmentsLimitReachedTitle", assignmentsLimit)
.getString() : "";
}
};
Expand Down
14 changes: 8 additions & 6 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
View file
Expand Up @@ -74,7 +74,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_RELATION_DEFINITION_LIST = DOT_CLASS + "loadRelationDefinitionList";
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 @@ -132,7 +131,7 @@ 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() {
Expand Down Expand Up @@ -166,7 +165,7 @@ 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() {
Expand Down Expand Up @@ -248,8 +247,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 @@ -296,7 +294,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.java
View file
Expand Up @@ -146,7 +146,7 @@ public boolean isEnabled(){
&& (storage.isMultiUserRequest() || dto.isAssignable()); }
});
addToCartButton.add(AttributeAppender.append("title",
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), parentPage)));
AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(parentPage)));
shoppingCartButtonsPanel.add(addToCartButton);

AjaxButton shoppingCartButton = new AjaxButton(ID_SHOPPING_CART_BUTTON) {
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 4b6b651

Please sign in to comment.