MID-4377 object list page size fix

Evolveum · Jan 16, 2018 · 44fd386 · 44fd386
1 parent 88972ee
commit 44fd386
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
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
@@ -92,24 +92,25 @@ public Class<? extends O> getType() {
 	 */
 	public ObjectListPanel(String id, Class<? extends O> defaultType, TableId tableId, Collection<SelectorOptions<GetOperationOptions>> options,
 			PageBase parentPage) {
-		this(id, defaultType, options, false, parentPage, null);
+		this(id, defaultType, tableId, options, false, parentPage, null);
 	}
 
 	/**
 	 * @param defaultType specifies type of the object that will be selected by default. It can be changed.
 	 */
-	ObjectListPanel(String id, Class<? extends O> defaultType, boolean multiselect, PageBase parentPage) {
-		this(id, defaultType, null, multiselect, parentPage, null);
+	ObjectListPanel(String id, Class<? extends O> defaultType, TableId tableId, boolean multiselect, PageBase parentPage) {
+		this(id, defaultType, tableId, null, multiselect, parentPage, null);
 	}
 
-	public ObjectListPanel(String id, Class<? extends O> defaultType, Collection<SelectorOptions<GetOperationOptions>> options,
+	public ObjectListPanel(String id, Class<? extends O> defaultType, TableId tableId, Collection<SelectorOptions<GetOperationOptions>> options,
 						   boolean multiselect, PageBase parentPage, List<O> selectedObjectsList) {
 		super(id);
 		this.type = defaultType  != null ? ObjectTypes.getObjectType(defaultType) : null;
 		this.parentPage = parentPage;
 		this.options = options;
 		this.multiselect = multiselect;
 		this.selectedObjects = selectedObjectsList;
+		this.tableId = tableId;
 		initLayout();
 	}
 

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
@@ -20,6 +20,7 @@
 
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
@@ -34,6 +35,7 @@
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.midpoint.web.session.UserProfileStorage.TableId;
 
 public abstract class PopupObjectListPanel<O extends ObjectType> extends ObjectListPanel<O> {
 	private static final long serialVersionUID = 1L;
@@ -42,13 +44,13 @@ public abstract class PopupObjectListPanel<O extends ObjectType> extends ObjectL
 	 * @param defaultType specifies type of the object that will be selected by default
 	 */
 	public PopupObjectListPanel(String id, Class<? extends O> defaultType, boolean multiselect, PageBase parentPage) {
-		super(id, defaultType, multiselect, parentPage);
+		super(id, defaultType, null, multiselect, parentPage);
 
 	}
 
 	public PopupObjectListPanel(String id, Class<? extends O> defaultType, Collection<SelectorOptions<GetOperationOptions>> options,
 								boolean multiselect, PageBase parentPage, List<O> selectedObjectsList) {
-		super(id, defaultType, options, multiselect, parentPage, selectedObjectsList);
+		super(id, defaultType, null, options, multiselect, parentPage, selectedObjectsList);
 
 	}