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

Evolveum · Mar 26, 2017 · d5316b0 · d5316b0
2 parents f355359 + 9b8e881
commit d5316b0
Show file tree

Hide file tree

Showing 44 changed files with 1,010 additions and 2,333 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java
@@ -1,6 +1,7 @@
 package com.evolveum.midpoint.web.component.assignment;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import org.apache.wicket.model.IModel;
 
 /**
@@ -13,14 +14,14 @@ public AssignmentDetailsPanel(String id) {
         super(id);
     }
 
-    public AssignmentDetailsPanel(String id, IModel<AssignmentEditorDto> model) {
+    public AssignmentDetailsPanel(String id, IModel<AssignmentEditorDto> model, PageBase pageBase) {
         super(id, model);
-        initLayout();
+        initLayout(pageBase);
     }
 
-    private void initLayout() {
+    private void initLayout(PageBase pageBase) {
         setOutputMarkupId(true);
-        ShoppingCartEditorPanel assignmentDetailsPanel = new ShoppingCartEditorPanel(ID_DETAILS_PANEL, getModel());
+        ShoppingCartEditorPanel assignmentDetailsPanel = new ShoppingCartEditorPanel(ID_DETAILS_PANEL, getModel(), pageBase);
         assignmentDetailsPanel.setOutputMarkupId(true);
         add(assignmentDetailsPanel);
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
@@ -43,13 +43,13 @@
         		<div class="row">
         			<div class="container-fluid prism-container">
 
-        				<div class="row prism-header">
+        				<div wicket:id="propertyContainer" class="row prism-header">
 							<span class="prism-title"><wicket:message key="ActivationType.properties"/></span>
 						</div>
 
         				<div class="prism-properties">
 
-        					<div>
+        					<div wicket:id="descriptionContainer" >
 	        					<div class="row prism-property">
 					                <div class="col-xs-4">
 					                    <span><wicket:message key="AssignmentEditorPanel.description"/></span>
@@ -80,7 +80,7 @@
 					            </div>
 				            </div>
 
-				            <div>
+				            <div wicket:id="focusTypeContainer" >
 	        					<div class="row prism-property">
 					                <div class="col-xs-4">
 					                    <span><wicket:message key="AssignmentEditorPanel.focusType"/></span>
@@ -127,7 +127,7 @@
 						<div class="prism-properties">
 
 							<div>
-								<div class="row prism-property">
+								<div wicket:id="administrativeStatusContainer" class="row prism-property">
 			                        <div class="col-xs-4">
 			                            <span><wicket:message key="ActivationType.administrativeStatus"/></span>
 			                        </div>
@@ -141,7 +141,7 @@
 								</div>
 							</div>
 
-							<div class="stripe">
+							<div wicket:id="validFromContainer"  class="stripe">
 								<div class="row prism-property">
 			                        <div class="col-xs-4">
 			                            <span><wicket:message key="ActivationType.validFrom"/></span>
@@ -157,7 +157,7 @@
 							</div>
 
 							<div>
-								<div class="row prism-property">							
+								<div wicket:id="validToContainer" class="row prism-property">
 			                        <div class="col-xs-4">
 			                            <span><wicket:message key="ActivationType.validTo"/></span>
 			                        </div>