assignment tab fixes

Evolveum · Jan 2, 2019 · 006c08c · 006c08c
1 parent df764cb
commit 006c08c
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 20 deletions.
diff --git a/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java b/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java
@@ -139,6 +139,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
 			@Override
 			public void onClick(AjaxRequestTarget ajaxRequestTarget) {
 				itemDetailsVisible = false;
+				cancelItemDetailsPerformed(ajaxRequestTarget);
 				ajaxRequestTarget.add(MultivalueContainerListPanelWithDetailsPanel.this);
 			}
 		};
@@ -152,6 +153,9 @@ public void itemDetailsPerformed(AjaxRequestTarget target, IModel<ContainerValue
 	public void itemDetailsPerformed(AjaxRequestTarget target, List<ContainerValueWrapper<C>> listItems) {
 		itemPerformedForDefaultAction(target, null, listItems);
 	}
+
+	protected void cancelItemDetailsPerformed(AjaxRequestTarget target){
+	}
 
 	@Override
 	protected void itemPerformedForDefaultAction(AjaxRequestTarget target, IModel<ContainerValueWrapper<C>> rowModel,
@@ -177,7 +181,7 @@ protected void itemPerformedForDefaultAction(AjaxRequestTarget target, IModel<Co
 	}
 
 	@Override
-	protected boolean isListPanelVisible() {
+	public boolean isListPanelVisible() {
 		return !itemDetailsVisible;
 	}
 }
diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java b/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
@@ -263,9 +263,9 @@ private <O extends ObjectType> IModel<String> getIdentifierLabelModel(ContainerV
         return Model.of("");
     }
 
-	protected List<ObjectTypes> getObjectTypesList(){
-        return WebComponentUtil.createAssignableTypesList();
-    }
+//	protected List<ObjectTypes> getObjectTypesList(){
+//        return WebComponentUtil.createAssignableTypesList();
+//    }
 
 	@Override
 	protected Fragment getCustomSpecificContainers(String contentAreaId, ContainerValueWrapper<AssignmentType> modelObject) {

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
@@ -121,6 +121,11 @@ AuthorizationPhaseType.REQUEST, getFocusObject(),
 				}
 			}
 
+			@Override
+			protected void cancelItemDetailsPerformed(AjaxRequestTarget target){
+				AssignmentPanel.this.cancelAssignmentDetailsPerformed(target);
+			}
+
 			@Override
 			protected ObjectQuery createQuery() {
 				return createObjectQuery();
@@ -250,6 +255,9 @@ protected ObjectQuery createObjectQuery(){
 				.build();
 	}
 
+	protected void cancelAssignmentDetailsPerformed(AjaxRequestTarget target){
+	}
+
 	private List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initBasicColumns() {
 		List<IColumn<ContainerValueWrapper<AssignmentType>, String>> columns = new ArrayList<>();
 
@@ -288,6 +296,7 @@ protected IModel<String> createLinkModel(IModel<ContainerValueWrapper<Assignment
 
 			@Override
 			public void onClick(AjaxRequestTarget target, IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
+				AssignmentPanel.this.assignmentDetailsPerformed(target);
 				getMultivalueContainerListPanel().itemDetailsPerformed(target, rowModel);
 			}
 		});
@@ -322,6 +331,9 @@ protected List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initColum
 		return new ArrayList<>();
 	}
 
+	protected void assignmentDetailsPerformed(AjaxRequestTarget target){
+	}
+
 	protected void newAssignmentClickPerformed(AjaxRequestTarget target){
 		AssignmentPopup popupPanel = new AssignmentPopup(getPageBase().getMainPopupBodyId()) {
 
@@ -708,7 +720,7 @@ protected MultivalueContainerListPanelWithDetailsPanel<AssignmentType> getMultiv
 		return ((MultivalueContainerListPanelWithDetailsPanel<AssignmentType>)get(ID_ASSIGNMENTS));
 	}
 
-	protected MultivalueContainerDetailsPanel<AssignmentType> getMultivalueContainerDetailsPanel() {
+	public MultivalueContainerDetailsPanel<AssignmentType> getMultivalueContainerDetailsPanel() {
 		return ((MultivalueContainerDetailsPanel<AssignmentType>)get(MultivalueContainerListPanelWithDetailsPanel.ID_ITEM_DETAILS));
 	}
 

diff --git a/...c/main/java/com/evolveum/midpoint/web/component/assignment/SwitchAssignmentTypePanel.html b/...c/main/java/com/evolveum/midpoint/web/component/assignment/SwitchAssignmentTypePanel.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div class="btn-group">
+    <div wicket:id="assignmentTypeButtons" class="btn-group">
         <div wicket:id="allAssignments" />
         <div wicket:id="roleTypeAssignments" />
         <div wicket:id="orgTypeAssignments" />