Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Nov 28, 2017
2 parents 1cb95ad + 038bc09 commit 07f4f54
Show file tree
Hide file tree
Showing 8 changed files with 517 additions and 358 deletions.
71 changes: 23 additions & 48 deletions .../src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
View file
Expand Up @@ -15,14 +15,11 @@
*/
package com.evolveum.midpoint.web.component.assignment;

import com.evolveum.midpoint.prism.PrismContainer;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.Containerable;
import com.evolveum.midpoint.web.component.form.Form;
import com.evolveum.midpoint.web.component.prism.ContainerValueWrapper;
import com.evolveum.midpoint.web.component.prism.ContainerWrapper;
import com.evolveum.midpoint.web.component.prism.PrismContainerPanel;
import com.evolveum.midpoint.web.component.prism.PrismPanel;
import com.evolveum.midpoint.web.model.ContainerWrapperFromObjectWrapperModel;
import com.evolveum.midpoint.web.model.ContainerWrapperListFromObjectWrapperModel;
import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
Expand All @@ -33,56 +30,34 @@
/**
* Created by honchar.
*/
public class InducementDetailsPanel<R extends AbstractRoleType> extends AbstractRoleAssignmentDetailsPanel<R> {
public class InducementDetailsPanel<R extends AbstractRoleType, C extends Containerable> extends AbstractRoleAssignmentDetailsPanel<R> {
private static final long serialVersionUID = 1L;

public InducementDetailsPanel(String id, Form<?> form, IModel<ContainerValueWrapper<AssignmentType>> assignmentModel) {
super(id, form, assignmentModel);
}

// @Override
// protected void initContainersPanel(Form form, PageAdminObjectDetails<R> pageBase){
// ContainerWrapperListFromObjectWrapperModel<ConstructionType, R> containerModel =
// new ContainerWrapperListFromObjectWrapperModel<ConstructionType, R>(pageBase.getObjectModel(), collectContainersToShow());
// if (containerModel != null){
// containerModel.getObject().forEach(container -> {
// if (container.getName().equals(AssignmentType.F_CONSTRUCTION) &&
// container.getValues().size() > 0){
// container.getValues().get(0).getItems().forEach(constructionContainerItem -> {
// if (constructionContainerItem instanceof PrismContainer &&
// ((PrismContainer) constructionContainerItem).getElementName().equals(ConstructionType.F_ASSOCIATION)){
// PrismContainer<ResourceObjectAssociationType> associationCont =
// (PrismContainer<ResourceObjectAssociationType>)constructionContainerItem;
// ((PrismContainer) constructionContainerItem).getValue().
// }
// });
//
//
//
// List<ResourceObjectAssociationType> associations = construction.getAssociation();
// if (associations != null){
// associations.forEach(association -> {
//
// });
// }
// ContainerValueWrapper associationContainer =
// container.findContainerValueWrapper(container.getPath().append(ConstructionType.F_ASSOCIATION));
// if (associationContainer != null && associationContainer.getItems() != null) {
// associationContainer.getItems().forEach(itemWrapper -> {
// if (itemWrapper instanceof ContainerWrapper && ((ContainerWrapper) itemWrapper).getPath().last().toString()
// .equals(ResourceObjectAssociationType.F_OUTBOUND.getLocalPart())) {
// ((ContainerWrapper) itemWrapper).setAddContainAssignmentTypeerButtonVisible(true);
// ((ContainerWrapper) itemWrapper).setShowEmpty(true, false);
// }
// });
// }
// }
// });
// }
@Override
protected void initContainersPanel(Form form, PageAdminObjectDetails<R> pageBase){
ContainerWrapperListFromObjectWrapperModel<C, R> containerModel =
new ContainerWrapperListFromObjectWrapperModel<C, R>(pageBase.getObjectModel(), collectContainersToShow());
if (containerModel != null && containerModel.getObject() != null){
containerModel.getObject().forEach(container -> {
if (container.getName().equals(AssignmentType.F_CONSTRUCTION)) {
container.setAddContainerButtonVisible(true);
container.setShowEmpty(true, false);

// PrismPanel<AssignmentType> containers = new PrismPanel<>(ID_SPECIFIC_CONTAINERS, containerModel,
// null, form, null, pageBase) ;
// add(containers);
// }
ContainerWrapper associationWrapper = container.findContainerWrapper(container.getPath().append(ConstructionType.F_ASSOCIATION));
if (associationWrapper != null) {
associationWrapper.setRemoveContainerButtonVisible(true);
}
}
});
}

PrismPanel<C> containers = new PrismPanel<C>(ID_SPECIFIC_CONTAINERS, containerModel,
null, form, null, pageBase) ;
add(containers);
}

}
3 changes: 3 additions & 0 deletions ...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
View file
Expand Up @@ -569,6 +569,9 @@ private void addItemDelta(PropertyOrReferenceWrapper itemWrapper, ItemDelta pDel

public void addNewChildContainerValue(QName path, PageBase pageBase){
ContainerWrapper<C> childContainerWrapper = getContainer().findContainerWrapper(new ItemPath(getPath(), path));
if (childContainerWrapper == null){
return;
}
boolean isSingleValue = childContainerWrapper.getItemDefinition().isSingleValue();
if (isSingleValue){
return;
Expand Down
4 changes: 3 additions & 1 deletion ...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
View file
Expand Up @@ -405,12 +405,14 @@ private <C extends Containerable> ContainerWrapper<C> createContainerWrapper(Pri
PrismContainer<C> newContainer;
try {
newContainer = (PrismContainer) def.instantiate();
newContainer.setParent(containerValue);
// containerValue.add(newContainer);
} catch (SchemaException e) {
LoggingUtils.logException(LOGGER, "Cannot create container " + def.getName(), e);
return null;
}
return createContainerWrapper(newContainer, cWrapper.getObjectStatus(), ContainerStatus.ADDING, cWrapper.getPath().append(newContainer.getPath()));
return createContainerWrapper(newContainer, cWrapper.getObjectStatus(), ContainerStatus.ADDING,
cWrapper.getPath().append(new ItemPath(newContainer.getElementName())));
}
return createContainerWrapper(container, cWrapper.getObjectStatus(), cWrapper.getStatus() == ValueStatus.ADDED ? ContainerStatus.ADDING: ContainerStatus.MODIFYING, container.getPath());
}
Expand Down
4 changes: 3 additions & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -3854,4 +3854,6 @@ ExpressionValuePanel.path=Path
ExpressionValuePanel.value=Value
ExpressionValuePanel.specifyExpression=Specify expression
ExpressionValuePanel.addValueButtonDefaultTitle=Add shadow reference value
ExpressionValuePanel.addValueButtonTargetSearchTitle=Add association target search
ExpressionValuePanel.addValueButtonTargetSearchTitle=Add association target search
ConstructionType.attribute=Attribute
ConstructionType.association=Association

0 comments on commit 07f4f54

Please sign in to comment.