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 index b15626222ba..ace0ee8e924 100644 --- 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 @@ -248,6 +248,14 @@ public String getObject() { protected void onPageChanged(AjaxRequestTarget target, long page) { target.add(count); } + + @Override + protected boolean isCountingDisabled(){ + if (dataTable.getDataProvider() instanceof SelectableBeanObjectDataProvider){ + return !((SelectableBeanObjectDataProvider)dataTable.getDataProvider()).isUseObjectCounting(); + } + return super.isCountingDisabled(); + } }; footerContainer.add(nb2); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java index c962e69244f..68063c06b26 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java @@ -273,7 +273,7 @@ public void onClick(AjaxRequestTarget target) { @Override public boolean isEnabled() { - return BooleanUtils.isTrue(showPageListingModel.getObject()) && isLastEnabled(); + return !isCountingDisabled() && BooleanUtils.isTrue(showPageListingModel.getObject()) && isLastEnabled(); } }); last.add(lastLink); @@ -330,4 +330,8 @@ private void pageLinkPerformed(AjaxRequestTarget target, long page) { protected void onPageChanged(AjaxRequestTarget target, long page) { } + + protected boolean isCountingDisabled(){ + return false; + } }