small fixes for focus browser dialog panel..

Evolveum · Apr 11, 2016 · 962a49b · 962a49b
1 parent 7a58c11
commit 962a49b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
@@ -113,7 +113,6 @@ private ObjectListPanel<T> createObjectListPanel(Class<T> type, final boolean mu
 
 		};
 
-
 //		ObjectListPanel<T> listPanel = new ObjectListPanel<T>(ID_TABLE, type, parentPage) {
 //
 //			@Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
@@ -82,6 +82,8 @@ public abstract class ObjectListPanel<T extends ObjectType> extends BasePanel<T>
 	private Collection<SelectorOptions<GetOperationOptions>> options;
 
 	private int pageSize = 10;
+
+	private boolean multiselect;
 
 	private TableId tableId = TableId.TABLE_USERS;
 
@@ -110,7 +112,20 @@ public ObjectListPanel(String id, Class<T> type, Collection<SelectorOptions<GetO
 		this.options = options;
 		initLayout();
 	}
+
+	ObjectListPanel(String id, Class<T> type, boolean multiselect,
+			PageBase parentPage) {
+		super(id);
+		this.type = type;
+		this.parentPage = parentPage;
+		this.multiselect = multiselect;
+		initLayout();
+	}
 
+	public boolean isMultiselect() {
+		return multiselect;
+	}
+
 	public void setProvider(BaseSortableDataProvider<SelectableBean<T>> provider) {
 		this.provider = provider;
 	}

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
@@ -18,24 +18,22 @@
 
 public abstract class PopupObjectListPanel<T extends ObjectType> extends ObjectListPanel<T> {
 
-	private boolean multiselect;
-
 	public PopupObjectListPanel(String id, Class<T> type, boolean multiselect, PageBase parentPage) {
-		super(id, type, null, parentPage);
-		this.multiselect = multiselect;
+		super(id, type, multiselect, parentPage);
+
 	}
 
 	@Override
 	protected IColumn<SelectableBean<T>, String> createCheckboxColumn() {
-		if (multiselect) {
+		if (isMultiselect()) {
 			return new CheckBoxHeaderColumn<SelectableBean<T>>();
 		}
 		return null;
 	}
 
 	@Override
 	protected IColumn<SelectableBean<T>, String> createNameColumn() {
-		if (multiselect) {
+		if (!isMultiselect()) {
 			return new LinkColumn<SelectableBean<T>>(createStringResource("ObjectType.name"),
 					ObjectType.F_NAME.getLocalPart(), SelectableBean.F_VALUE + ".name") {
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -181,6 +181,7 @@ public static List<QName> createFocusTypeList() {
 		focusTypeList.add(UserType.COMPLEX_TYPE);
 		focusTypeList.add(OrgType.COMPLEX_TYPE);
 		focusTypeList.add(RoleType.COMPLEX_TYPE);
+		focusTypeList.add(ServiceType.COMPLEX_TYPE);
 
 		return focusTypeList;
 	}

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
@@ -86,7 +86,7 @@ public List<T> getSelectedData() {
     }
 
     private void preprocessSelectedData(){
-
+    	 preprocessSelectedDataInternal();
          getAvailableData().clear();
     }
 
@@ -169,9 +169,14 @@ protected void handleNotSuccessOrHandledErrorInIterator(OperationResult result){
 
     public W createDataObjectWrapper(T obj) {
     	SelectableBean<T> selectable = new SelectableBean<T>(obj);
-    	if (selected.contains(obj)){
-    		selectable.setSelected(true);
+    	for (T s : selected){
+    		if (s.getOid().equals(obj.getOid())){
+    			selectable.setSelected(true);
+    		}
     	}
+//    	if (selected.contains(obj)){
+//    		selectable.setSelected(true);
+//    	}
         return (W) selectable;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
@@ -773,7 +773,6 @@ private void addMembers(List<T> selected, AjaxRequestTarget target) {
 			String taskOid = execute("Add member(s)", getActionQuery(QueryScope.TO_ADD, selected), delta, parentResult, target);
 			parentResult.setBackgroundTaskOid(taskOid);
 		} catch (SchemaException e) {
-			// TODO Auto-generated catch block
 			error(getString("pageUsers.message.nothingSelected") + e.getMessage());
 			target.add(getFeedbackPanel());
 		}
@@ -792,7 +791,6 @@ private void removeMembersPerformed(AjaxRequestTarget target, QueryScope scope)
 			String taskOid = execute("Remove member(s)", getActionQuery(scope, null), delta, parentResult, target);
 			parentResult.setBackgroundTaskOid(taskOid);
 		} catch (SchemaException e) {
-			// TODO Auto-generated catch block
 			error(getString("pageUsers.message.nothingSelected") + e.getMessage());
 			target.add(getFeedbackPanel());
 		}