Merge remote-tracking branch 'origin/master'

Evolveum · Mar 27, 2019 · 2a75197 · 2a75197
2 parents e20a428 + 67ceb9c
commit 2a75197
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 320 deletions.
diff --git a/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.html b/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.html
diff --git a/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.java b/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.java
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
@@ -119,7 +119,7 @@ protected Item<T> newRowItem(String id, int index, IModel<T> rowModel) {
 
 		box.add(createHeader(ID_HEADER));
 		WebMarkupContainer footer = createFooter(ID_FOOTER);
-		footer.add(new VisibleBehaviour(() -> isFooterVisible(provider.size(), pageSize)));
+		footer.add(new VisibleBehaviour(() -> !hideFooterIfSinglePage() ||  provider.size() > pageSize));
 		box.add(footer);
 	}
 
@@ -136,8 +136,8 @@ protected Item<T> customizeNewRowItem(Item<T> item, IModel<T> model) {
 		return item;
 	}
 
-	protected boolean isFooterVisible(long providerSize, int pageSize){
-		return true;
+	protected boolean hideFooterIfSinglePage(){
+		return false;
 	}
 
 	@Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
@@ -167,8 +167,8 @@ public Date getObject() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected boolean isFooterVisible(long providerSize, int pageSize){
-				return WorkItemsPanel.this.isFooterVisible(providerSize, pageSize);
+			protected boolean hideFooterIfSinglePage(){
+				return WorkItemsPanel.this.hideFooterIfSinglePage();
 			}
 		};
 		workItemsTable.setAdditionalBoxCssClasses("without-box-header-top-border");
@@ -350,7 +350,7 @@ public void populateItem(Item<ICellPopulator<WorkItemDto>> item, String componen
 		};
 	}
 
-	protected boolean isFooterVisible(long providerSize, int pageSize){
-		return true;
+	protected boolean hideFooterIfSinglePage(){
+		return false;
 	}
 }
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java
@@ -94,8 +94,8 @@ public String getObject() {
 			}
 
 			@Override
-			protected boolean isFooterVisible(long providerSize, int pageSize){
-				return ProcessInstancesPanel.this.isFooterVisible(providerSize, pageSize);
+			protected boolean hideFooterIfSinglePage(){
+				return ProcessInstancesPanel.this.hideFooterIfSinglePage();
 			}
 		};
 		table.setOutputMarkupId(true);
@@ -231,8 +231,8 @@ private String choose(IModel<ProcessInstanceDto> rowModel, String noReply, Strin
 		};
 	}
 
-	protected boolean isFooterVisible(long providerSize, int pageSize){
-		return true;
+	protected boolean hideFooterIfSinglePage(){
+		return false;
 	}
 
 	private void itemDetailsPerformed(AjaxRequestTarget target, String pid) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
@@ -202,8 +202,8 @@ protected Component getMainComponent(String markupId) {
                             private static final long serialVersionUID = 1L;
 
                             @Override
-                            protected boolean isFooterVisible(long providerSize, int pageSize){
-                                return providerSize > pageSize;
+                            protected boolean hideFooterIfSinglePage(){
+                                return true;
                             }
                         };
                     }
@@ -250,8 +250,8 @@ protected Component getMainComponent(String markupId) {
                             private static final long serialVersionUID = 1L;
 
                             @Override
-                            protected boolean isFooterVisible(long providerSize, int pageSize){
-                                return providerSize > pageSize;
+                            protected boolean hideFooterIfSinglePage(){
+                                return true;
                             }
                         };
                     }