fixes for assignment/inducement panels

Evolveum · Mar 6, 2018 · ef2e87e · ef2e87e
1 parent 5b7e843
commit ef2e87e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/...va/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java b/...va/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
@@ -19,6 +19,7 @@
 import java.util.List;
 
 import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.web.component.input.QNameEditorPanel;
 import com.evolveum.midpoint.web.component.prism.ContainerValueWrapper;
 import com.evolveum.midpoint.web.component.prism.ContainerWrapper;
 import com.evolveum.midpoint.web.model.ContainerWrapperListFromObjectWrapperModel;
@@ -29,6 +30,8 @@
 import com.evolveum.midpoint.web.component.form.Form;
 import org.apache.wicket.model.Model;
 
+import javax.xml.namespace.QName;
+
 /**
  * TODO: is this class abstract or not?
  */
@@ -44,7 +47,7 @@ public AbstractRoleAssignmentDetailsPanel(String id, Form<?> form, IModel<Contai
 	@Override
 	protected IModel<ContainerWrapper> getSpecificContainerModel() {
 		if (ConstructionType.COMPLEX_TYPE.equals(AssignmentsUtil.getTargetType(getModelObject().getContainerValue().getValue()))) {
-			ContainerWrapper<ConstructionType> constructionWrapper = getModelObject().findContainerWrapper(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_CONSTRUCTION));
+			ContainerWrapper<ConstructionType> constructionWrapper = getModelObject().findContainerWrapper(new ItemPath(getObjectContainerPath(), AssignmentType.F_CONSTRUCTION));
 			constructionWrapper.setAddContainerButtonVisible(true);
 			constructionWrapper.setShowEmpty(true, false);
 			if (constructionWrapper != null && constructionWrapper.getValues() != null) {
@@ -58,14 +61,17 @@ protected IModel<ContainerWrapper> getSpecificContainerModel() {
 		}
 
 		if (PersonaConstructionType.COMPLEX_TYPE.equals(AssignmentsUtil.getTargetType(getModelObject().getContainerValue().getValue()))) {
-			ContainerWrapper<PolicyRuleType> personasWrapper = getModelObject().findContainerWrapper(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_PERSONA_CONSTRUCTION));
+			ContainerWrapper<PolicyRuleType> personasWrapper = getModelObject().findContainerWrapper(new ItemPath(getObjectContainerPath(), AssignmentType.F_PERSONA_CONSTRUCTION));
 			if (personasWrapper != null && personasWrapper.getValues() != null) {
 				personasWrapper.getValues().forEach(vw -> vw.setShowEmpty(true, false));
 			}
 
-			return Model.of();
+			return Model.of(personasWrapper);
 		}
-		return null;
+		return Model.of();
 	}
 
+	protected QName getObjectContainerPath(){
+		return FocusType.F_ASSIGNMENT;
+	}
 }
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
@@ -20,6 +20,9 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.model.IModel;
 
+import javax.xml.namespace.QName;
+import java.util.List;
+
 /**
  * Created by honchar.
  */
@@ -29,4 +32,8 @@ public class InducementDetailsPanel<R extends AbstractRoleType> extends Abstract
     public InducementDetailsPanel(String id, Form<?> form, IModel<ContainerValueWrapper<AssignmentType>> assignmentModel) {
         super(id, form, assignmentModel);
     }
+
+    protected QName getObjectContainerPath(){
+        return AbstractRoleType.F_INDUCEMENT;
+    }
 }
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
@@ -60,7 +60,7 @@ private void setAddContainerButtonVisibility(ContainerWrapper<PolicyRuleType> po
 
 	@Override
 	protected IModel<ContainerWrapper> getSpecificContainerModel() {
-		ContainerWrapper<PolicyRuleType> policyRuleWrapper = getModelObject().findContainerWrapper(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_POLICY_RULE));
+		ContainerWrapper<PolicyRuleType> policyRuleWrapper = getModelObject().findContainerWrapper(new ItemPath(getModelObject().getPath(), AssignmentType.F_POLICY_RULE));
 		if (policyRuleWrapper != null && policyRuleWrapper.getValues() != null) {
 			policyRuleWrapper.getValues().forEach(vw -> vw.setShowEmpty(true, false));
 		}

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -14179,7 +14179,6 @@
             </xsd:documentation>
             <xsd:appinfo>
 				<a:since>3.5</a:since>
-				<a:experimental>true</a:experimental>
 				<a:container>true</a:container>
 			</xsd:appinfo>
         </xsd:annotation>