gCubeSystem
/
PerformFISH-Apps-portlet
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for hiding some of the CLOSED BATCHES Forms

This commit is contained in:
Massimiliano Assante 2020-02-07 14:33:24 +01:00
parent 704272a17b
commit 081509e51c
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -50,10 +50,12 @@
<dependency>
<groupId>org.gcube.resources.discovery</groupId>
<artifactId>ic-client</artifactId>
<version>1.0.4-4.15.0-162683</version>
</dependency>
<dependency>
<groupId>org.gcube.resources</groupId>
<artifactId>registry-publisher</artifactId>
<version>1.2.9-4.15.0-151412</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@ -63,6 +65,7 @@
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>storagehub-icons-library</artifactId>
<version>1.1.1-4.13.1-173244</version>
</dependency>
<dependency>
<groupId>org.gcube.dvos</groupId>
@ -82,40 +85,45 @@
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>
<version>1.0.8</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-model</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId>
<scope>compile</scope>
<version>1.1.0-4.15.0-178670</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
<version>2.10.2-4.13.1-164488</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
<version>2.11.5-4.13.1-169333</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-model</artifactId>
<version>1.8.1-4.13.1-164481</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>authorization-client</artifactId>
<scope>provided</scope>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>common-authorization</artifactId>
<scope>provided</scope>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>

13
src/main/webapp/html/emptyformsdocumentsdisplay/empty_forms_fileupload_display.jsp
View File

@ -12,6 +12,8 @@
pageContext.setAttribute("selectedPhase", selectedPhase);
GCubeTeam theFarm = (GCubeTeam) request.getAttribute("theFarm");
pageContext.setAttribute("theFarm", theFarm);
%>
<c:if test="${not empty theFarm }">
<div class="row-fluid">
@ -29,14 +31,15 @@
<table class="display">
<tbody>
<c:forEach var="file" items="${theSheets}">
<tr>
<%
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";
%>
<tr style="display: <%=display%>;">
<portlet:resourceURL var="downloadFileURL">
<portlet:param name="fileToDownloadId" value="${file.id}" />
</portlet:resourceURL>
<%
WorkspaceItem item = (WorkspaceItem) pageContext.getAttribute("file");
String iconHTML = IconsManager.getMDIconTextualName(item.getName()).getHtml();
%>
<td><%=iconHTML%></td>
<td><span style="font-size: 1.1em; padding: 15px 10px; "><a
href="javascript:downloadItem('${downloadFileURL}');"