From 081509e51c076fc8c90cb69bd4625b70c38f6d1c Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 7 Feb 2020 14:33:24 +0100 Subject: [PATCH] fix for hiding some of the CLOSED BATCHES Forms --- pom.xml | 14 +++++++++++--- .../empty_forms_fileupload_display.jsp | 13 ++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index da42f40..ec46f1e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,10 +50,12 @@ org.gcube.resources.discovery ic-client + 1.0.4-4.15.0-162683 org.gcube.resources registry-publisher + 1.2.9-4.15.0-151412 org.apache.httpcomponents @@ -63,6 +65,7 @@ org.gcube.portal storagehub-icons-library + 1.1.1-4.13.1-173244 org.gcube.dvos @@ -82,40 +85,45 @@ org.gcube.common storagehub-client-library + 1.0.8 org.gcube.common storagehub-model + 1.0.5 org.gcube.core common-scope-maps - compile + 1.1.0-4.15.0-178670 org.gcube.common home-library + 2.10.2-4.13.1-164488 provided org.gcube.common home-library-jcr + 2.11.5-4.13.1-169333 provided org.gcube.common home-library-model + 1.8.1-4.13.1-164481 provided org.gcube.common authorization-client - provided + 2.0.6 org.gcube.common common-authorization - provided + 2.2.0 org.postgresql diff --git a/src/main/webapp/html/emptyformsdocumentsdisplay/empty_forms_fileupload_display.jsp b/src/main/webapp/html/emptyformsdocumentsdisplay/empty_forms_fileupload_display.jsp index 84b8394..5f71f6f 100644 --- a/src/main/webapp/html/emptyformsdocumentsdisplay/empty_forms_fileupload_display.jsp +++ b/src/main/webapp/html/emptyformsdocumentsdisplay/empty_forms_fileupload_display.jsp @@ -12,6 +12,8 @@ pageContext.setAttribute("selectedPhase", selectedPhase); GCubeTeam theFarm = (GCubeTeam) request.getAttribute("theFarm"); pageContext.setAttribute("theFarm", theFarm); + + %>
@@ -29,14 +31,15 @@ - + <% + WorkspaceItem item = (WorkspaceItem) pageContext.getAttribute("file"); + String iconHTML = IconsManager.getMDIconTextualName(item.getName()).getHtml(); + String display = (!item.getName().equals("CLOSED BATCHES Farm Data.xlsx") && item.getName().startsWith("CLOSED")) ? "none": "block"; + %> + - <% - WorkspaceItem item = (WorkspaceItem) pageContext.getAttribute("file"); - String iconHTML = IconsManager.getMDIconTextualName(item.getName()).getHtml(); - %>
<%=iconHTML%>