fixing MID-3137

changing page size on Select object(s)
Evolveum · Jun 16, 2016 · 18af4e3 · 18af4e3
1 parent 4cd17c2
commit 18af4e3
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
@@ -256,11 +256,13 @@ protected void onPageChanged(AjaxRequestTarget target, long page) {
 				protected void pageSizeChanged(AjaxRequestTarget target) {
 					Table table = findParent(Table.class);
 					UserProfileStorage.TableId tableId = table.getTableId();
-
-					PageBase page = (PageBase) getPage();
-					Integer pageSize = page.getSessionStorage().getUserProfile().getPagingSize(tableId);
-
-					table.setItemsPerPage(pageSize);
+
+					if (tableId != null) {
+						PageBase page = (PageBase) getPage();
+						Integer pageSize = page.getSessionStorage().getUserProfile().getPagingSize(tableId);
+
+						table.setItemsPerPage(pageSize);
+					}
 					target.add(findParent(PagingFooter.class));
 					target.add((Component) table);
 				}