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 Apr 5, 2018
2 parents e2d24af + aeaa15a commit 839fde5
Show file tree
Hide file tree
Showing 43 changed files with 1,320 additions and 424 deletions.
5 changes: 3 additions & 2 deletions build-system/pom.xml
View file
Expand Up @@ -49,7 +49,7 @@
<commons.lang.version>2.6</commons.lang.version>
<commons.lang3.version>3.7</commons.lang3.version>
<commons.cli>1.2</commons.cli>
<cxf.version>3.2.1</cxf.version>
<cxf.version>3.2.4</cxf.version>
<cxf-xjc.version>3.2.0</cxf-xjc.version>
<wss4j.version>2.2.0</wss4j.version>
<dbunit.version>2.4.7</dbunit.version>
Expand All @@ -63,7 +63,8 @@
<selenium.version>1.0.1</selenium.version>
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
<spring.boot.version>1.5.8.e1</spring.boot.version>
<spring.boot.version>1.5.8.e1</spring.boot.version> <!-- can be replaced by a stock version;
ideally after https://github.com/spring-projects/spring-boot/issues/11367 is resolved but it should be OK even before that -->
<spring.version>4.3.14.RELEASE</spring.version>
<spring.security.version>4.2.4.RELEASE</spring.security.version>
<cas.client.version>3.5.0</cas.client.version>
Expand Down
8 changes: 8 additions & 0 deletions config/sql/_all/h2-3.8-all.sql
View file
Expand Up @@ -749,6 +749,10 @@ CREATE INDEX iAssignmentAdministrative
ON m_assignment (administrativeStatus);
CREATE INDEX iAssignmentEffective
ON m_assignment (effectiveStatus);
CREATE INDEX iAssignmentValidFrom
ON m_assignment (validFrom);
CREATE INDEX iAssignmentValidTo
ON m_assignment (validTo);
CREATE INDEX iTargetRefTargetOid
ON m_assignment (targetRef_targetOid);
CREATE INDEX iTenantRefTargetOid
Expand Down Expand Up @@ -881,6 +885,10 @@ CREATE INDEX iFocusEffective
ON m_focus (effectiveStatus);
CREATE INDEX iLocality
ON m_focus (locality_orig);
CREATE INDEX iFocusValidFrom
ON m_focus (validFrom);
CREATE INDEX iFocusValidTo
ON m_focus (validTo);
CREATE INDEX iFormNameOrig
ON m_form (name_orig);
ALTER TABLE m_form
Expand Down
8 changes: 8 additions & 0 deletions config/sql/_all/mysql-3.8-all-utf8mb4.sql
View file
Expand Up @@ -957,6 +957,10 @@ CREATE INDEX iAssignmentAdministrative
ON m_assignment (administrativeStatus);
CREATE INDEX iAssignmentEffective
ON m_assignment (effectiveStatus);
CREATE INDEX iAssignmentValidFrom
ON m_assignment (validFrom);
CREATE INDEX iAssignmentValidTo
ON m_assignment (validTo);
CREATE INDEX iTargetRefTargetOid
ON m_assignment (targetRef_targetOid);
CREATE INDEX iTenantRefTargetOid
Expand Down Expand Up @@ -1087,6 +1091,10 @@ CREATE INDEX iFocusEffective
ON m_focus (effectiveStatus);
CREATE INDEX iLocality
ON m_focus (locality_orig);
CREATE INDEX iFocusValidFrom
ON m_focus (validFrom);
CREATE INDEX iFocusValidTo
ON m_focus (validTo);
CREATE INDEX iFormNameOrig
ON m_form (name_orig);
ALTER TABLE m_form
Expand Down
8 changes: 8 additions & 0 deletions config/sql/_all/mysql-3.8-all.sql
View file
Expand Up @@ -957,6 +957,10 @@ CREATE INDEX iAssignmentAdministrative
ON m_assignment (administrativeStatus);
CREATE INDEX iAssignmentEffective
ON m_assignment (effectiveStatus);
CREATE INDEX iAssignmentValidFrom
ON m_assignment (validFrom);
CREATE INDEX iAssignmentValidTo
ON m_assignment (validTo);
CREATE INDEX iTargetRefTargetOid
ON m_assignment (targetRef_targetOid);
CREATE INDEX iTenantRefTargetOid
Expand Down Expand Up @@ -1087,6 +1091,10 @@ CREATE INDEX iFocusEffective
ON m_focus (effectiveStatus);
CREATE INDEX iLocality
ON m_focus (locality_orig);
CREATE INDEX iFocusValidFrom
ON m_focus (validFrom);
CREATE INDEX iFocusValidTo
ON m_focus (validTo);
CREATE INDEX iFormNameOrig
ON m_form (name_orig);
ALTER TABLE m_form
Expand Down
8 changes: 8 additions & 0 deletions config/sql/_all/oracle-3.8-all.sql
View file
Expand Up @@ -745,6 +745,10 @@ CREATE INDEX iAssignmentAdministrative
ON m_assignment (administrativeStatus) INITRANS 30;
CREATE INDEX iAssignmentEffective
ON m_assignment (effectiveStatus) INITRANS 30;
CREATE INDEX iAssignmentValidFrom
ON m_assignment (validFrom) INITRANS 30;
CREATE INDEX iAssignmentValidTo
ON m_assignment (validTo) INITRANS 30;
CREATE INDEX iTargetRefTargetOid
ON m_assignment (targetRef_targetOid) INITRANS 30;
CREATE INDEX iTenantRefTargetOid
Expand Down Expand Up @@ -877,6 +881,10 @@ CREATE INDEX iFocusEffective
ON m_focus (effectiveStatus) INITRANS 30;
CREATE INDEX iLocality
ON m_focus (locality_orig) INITRANS 30;
CREATE INDEX iFocusValidFrom
ON m_focus (validFrom) INITRANS 30;
CREATE INDEX iFocusValidTo
ON m_focus (validTo) INITRANS 30;
CREATE INDEX iFormNameOrig
ON m_form (name_orig) INITRANS 30;
ALTER TABLE m_form
Expand Down
8 changes: 8 additions & 0 deletions config/sql/_all/postgresql-3.8-all.sql
View file
Expand Up @@ -745,6 +745,10 @@ CREATE INDEX iAssignmentAdministrative
ON m_assignment (administrativeStatus);
CREATE INDEX iAssignmentEffective
ON m_assignment (effectiveStatus);
CREATE INDEX iAssignmentValidFrom
ON m_assignment (validFrom);
CREATE INDEX iAssignmentValidTo
ON m_assignment (validTo);
CREATE INDEX iTargetRefTargetOid
ON m_assignment (targetRef_targetOid);
CREATE INDEX iTenantRefTargetOid
Expand Down Expand Up @@ -877,6 +881,10 @@ CREATE INDEX iFocusEffective
ON m_focus (effectiveStatus);
CREATE INDEX iLocality
ON m_focus (locality_orig);
CREATE INDEX iFocusValidFrom
ON m_focus (validFrom);
CREATE INDEX iFocusValidTo
ON m_focus (validTo);
CREATE INDEX iFormNameOrig
ON m_form (name_orig);
ALTER TABLE IF EXISTS m_form
Expand Down
8 changes: 8 additions & 0 deletions config/sql/_all/sqlserver-3.8-all.sql
View file
Expand Up @@ -745,6 +745,10 @@ CREATE INDEX iAssignmentAdministrative
ON m_assignment (administrativeStatus);
CREATE INDEX iAssignmentEffective
ON m_assignment (effectiveStatus);
CREATE INDEX iAssignmentValidFrom
ON m_assignment (validFrom);
CREATE INDEX iAssignmentValidTo
ON m_assignment (validTo);
CREATE INDEX iTargetRefTargetOid
ON m_assignment (targetRef_targetOid);
CREATE INDEX iTenantRefTargetOid
Expand Down Expand Up @@ -877,6 +881,10 @@ CREATE INDEX iFocusEffective
ON m_focus (effectiveStatus);
CREATE INDEX iLocality
ON m_focus (locality_orig);
CREATE INDEX iFocusValidFrom
ON m_focus (validFrom);
CREATE INDEX iFocusValidTo
ON m_focus (validTo);
CREATE INDEX iFormNameOrig
ON m_form (name_orig);
ALTER TABLE m_form
Expand Down
47 changes: 19 additions & 28 deletions ...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
View file
Expand Up @@ -206,7 +206,6 @@ protected <T extends ObjectType> void addSelectedAssignmentsPerformed(AjaxReques
constructionType.setResourceRef(ref);
constructionType.setKind(kind);
constructionType.setIntent(intent);
initAssociationContainer(constructionType);
assignmentType.setConstruction(constructionType);
} else {
assignmentType.setTargetRef(ref);
Expand All @@ -218,9 +217,6 @@ protected <T extends ObjectType> void addSelectedAssignmentsPerformed(AjaxReques
reloadSavePreviewButtons(target);
}

protected void initAssociationContainer(ConstructionType constructionType){
}

protected List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initColumns() {
List<IColumn<ContainerValueWrapper<AssignmentType>, String>> columns = new ArrayList<>();

Expand All @@ -231,6 +227,25 @@ public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentTyp
}
});

columns.add(new AbstractColumn<ContainerValueWrapper<AssignmentType>, String>(createStringResource("AssignmentType.tenant")){
private static final long serialVersionUID = 1L;

@Override
public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> item, String componentId,
final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
item.add(new Label(componentId, getTenantLabelModel(rowModel.getObject())));
}
});
columns.add(new AbstractColumn<ContainerValueWrapper<AssignmentType>, String>(createStringResource("AssignmentType.orgReferenceShorten")){
private static final long serialVersionUID = 1L;

@Override
public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> item, String componentId,
final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
item.add(new Label(componentId, getOrgRefLabelModel(rowModel.getObject())));
}
});

return columns;
}

Expand Down Expand Up @@ -308,30 +323,6 @@ protected AbstractAssignmentDetailsPanel createDetailsPanel(String idAssignmentD
return new AbstractRoleAssignmentDetailsPanel(ID_ASSIGNMENT_DETAILS, form, model);
}

@Override
protected List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initBasicColumns() {
List<IColumn<ContainerValueWrapper<AssignmentType>, String>> columns = super.initBasicColumns();
columns.add(new AbstractColumn<ContainerValueWrapper<AssignmentType>, String>(createStringResource("AssignmentType.tenant")){
private static final long serialVersionUID = 1L;

@Override
public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> item, String componentId,
final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
item.add(new Label(componentId, getTenantLabelModel(rowModel.getObject())));
}
});
columns.add(new AbstractColumn<ContainerValueWrapper<AssignmentType>, String>(createStringResource("AssignmentType.orgReferenceShorten")){
private static final long serialVersionUID = 1L;

@Override
public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> item, String componentId,
final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
item.add(new Label(componentId, getOrgRefLabelModel(rowModel.getObject())));
}
});
return columns;
}

private IModel<String> getTenantLabelModel(ContainerValueWrapper<AssignmentType> assignmentContainer){
if (assignmentContainer == null || assignmentContainer.getContainerValue() == null){
return Model.of("");
Expand Down
2 changes: 1 addition & 1 deletion ...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
View file
Expand Up @@ -224,7 +224,7 @@ protected AssignmentsTabStorage getAssignmentsStorage() {

protected abstract ObjectQuery createObjectQuery();

protected List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initBasicColumns() {
private List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initBasicColumns() {
List<IColumn<ContainerValueWrapper<AssignmentType>, String>> columns = new ArrayList<>();

columns.add(new CheckBoxHeaderColumn<>());
Expand Down
6 changes: 4 additions & 2 deletions ...ain/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
View file
Expand Up @@ -237,11 +237,13 @@ public List<ObjectReferenceType> load() {
PrismContainerValue associationValue = ((ContainerValueWrapper) associationValueWrapper).getContainerValue();
ResourceObjectAssociationType assoc = (ResourceObjectAssociationType) associationValue.asContainerable();
if (assoc == null || assoc.getOutbound() == null || assoc.getOutbound().getExpression() == null
|| ExpressionUtil.getShadowRefValue(assoc.getOutbound().getExpression()) == null) {
|| (ExpressionUtil.getShadowRefValue(assoc.getOutbound().getExpression()) == null
&& !ValueStatus.ADDED.equals(((ContainerValueWrapper) associationValueWrapper).getStatus()))) {
return;
}
QName assocRef = ItemPathUtil.getOnlySegmentQName(assoc.getRef());
if (defName != null && defName.equals(assocRef)) {
if ((defName != null && defName.equals(assocRef))
|| (assocRef == null && ValueStatus.ADDED.equals(((ContainerValueWrapper) associationValueWrapper).getStatus()))) {
shadowsList.add(ExpressionUtil.getShadowRefValue(assoc.getOutbound().getExpression()));
}
});
Expand Down

0 comments on commit 839fde5

Please sign in to comment.