Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Nov 13, 2017 · 43f7c9b · 43f7c9b
2 parents 0a6d151 + b3d306c
commit 43f7c9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...n/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html b/...n/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html
@@ -17,9 +17,9 @@
       xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:panel>
-        				<div wicket:id="displayName"/>
-    <div wicket:id="basic" />
-    <div wicket:id="otherContainers" />
+    <div wicket:id="displayName"/>
+    <div wicket:id="specificContainers" />
+    <div wicket:id="basicAssignmentPanel" />
     <div wicket:id="activationPanel" />
 
 <!--     <div class="box-body" > -->

diff --git a/...n/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java b/...n/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
@@ -55,7 +55,8 @@ public abstract class AbstractAssignmentDetailsPanel<F extends FocusType> extend
 
     private final static String ID_DISPLAY_NAME = "displayName";
     private final static String ID_ACTIVATION_PANEL = "activationPanel";
-    protected final static String ID_CONTAINERS = "otherContainers";
+    private final static String ID_BASIC_ASSIGNMENT_PANEL = "basicAssignmentPanel";
+    protected final static String ID_SPECIFIC_CONTAINERS = "specificContainers";
 
     public AbstractAssignmentDetailsPanel(String id, Form<?> form, IModel<ContainerValueWrapper<AssignmentType>> assignmentModel){
         super(id, assignmentModel);
@@ -123,7 +124,7 @@ protected QName getRelation() {
 		ContainerValueWrapper<AssignmentType> containerWrapper = getModelObject();
 		if (containerWrapper == null){}
 
-		ContainerValuePanel<AssignmentType> assignmentPanel = new ContainerValuePanel("basic", getModel(), true, form,
+		ContainerValuePanel<AssignmentType> assignmentPanel = new ContainerValuePanel(ID_BASIC_ASSIGNMENT_PANEL, getModel(), true, form,
 				itemWrapper -> getAssignmentBasicTabVisibity(itemWrapper, assignmentPath), pageBase);
 		add(assignmentPanel);
 
@@ -136,7 +137,7 @@ protected QName getRelation() {
     }
 
     protected void initContainersPanel(Form form, PageAdminObjectDetails<F> pageBase){
-		PrismPanel<AssignmentType> containers = new PrismPanel<>(ID_CONTAINERS, new ContainerWrapperListFromObjectWrapperModel<AssignmentType, F>(pageBase.getObjectModel(), collectContainersToShow()),
+		PrismPanel<AssignmentType> containers = new PrismPanel<>(ID_SPECIFIC_CONTAINERS, new ContainerWrapperListFromObjectWrapperModel<AssignmentType, F>(pageBase.getObjectModel(), collectContainersToShow()),
 				null, form, null, pageBase) ;
 		add(containers);
 	}