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

alfa tests on peorformFish_Dev are fine

Browse Source
Feature/21319
Massimiliano Assante 3 years ago
parent ecee67b4de
commit e4a95490e7
13 changed files with 64 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
.settings/org.eclipse.jdt.core.prefs
Unescape Escape View File

@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8

3
pom.xml
Unescape Escape View File

@ -40,7 +40,7 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId>
<version>3.6.1-SNAPSHOT</version>
<version>3.6.2-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -96,6 +96,7 @@
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>
<!-- <version>1.2.2</version> -->
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>

10
src/main/java/org/gcube/portlets/user/performfish/CompanyFarmRepository.java
Unescape Escape View File

@ -90,7 +90,7 @@ public class CompanyFarmRepository extends MVCPortlet {
HttpServletRequest httpReq = PortalUtil.getOriginalServletRequest(PortalUtil.getHttpServletRequest(request));
String[] farmIds = ParamUtil.getParameterValues(httpReq, Utils.ENCODED_FARM_PARAM);
String selectedItemId = (String) request.getAttribute("itemId");
if (selectedItemId == null) {//this handles when show version is clicked
if (selectedItemId == null) { //this handles when show version is clicked
if (farmIds == null || farmIds.length == 0) {
List<GCubeTeam> theFarms = Utils.getUserFarms(request, response, this); //if pass here only one farm is returned otherswise ir renders Utils.SELECT_FARM_PAGE_PATH
if (theFarms != null && ! theFarms.isEmpty()) {
@ -111,8 +111,10 @@ public class CompanyFarmRepository extends MVCPortlet {
_log.info(" initialise of CompanyFarmRepository Page done");
long groupId = PortalUtil.getScopeGroupId(request);
GCubeTeam theCompany = Utils.checkBelongingToOneCompanyOnly(request, response, this);
request.setAttribute("theCompany", theCompany);
request.setAttribute("theCompany", theCompany);
long currGroupidFarmRepo = PortalUtil.getScopeGroupId(request);
request.setAttribute("currGroupidFarmRepo", currGroupidFarmRepo);
String context = Utils.getCurrentContext(request);
String username = Utils.getCurrentUser(request).getUsername();
if (theFarm != null ) {
@ -152,7 +154,6 @@ public class CompanyFarmRepository extends MVCPortlet {
}
}
//TODO
List<SubmittedForm> submittedFormsWithPublishStatus= getSubmittedFormPublishAndAnonimStatus(request, context, theFarm.getTeamId(), filteredFiles);
request.setAttribute("submittedFormsWithPublishStatus", submittedFormsWithPublishStatus); //pass to the JSP
String imageUrl = Utils.getCompanyLogoURL(theCompany.getTeamName(), groupId, request);
@ -230,6 +231,7 @@ public class CompanyFarmRepository extends MVCPortlet {
} else
toReturn.add(new SubmittedForm(externalFile));
}
_log.debug("*** RETURNING PublishAnonymisedJob OK");
return toReturn;
}

24
src/main/java/org/gcube/portlets/user/performfish/EmptyFormsDocumentsDisplay.java
Unescape Escape View File

@ -25,6 +25,8 @@ import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.common.storagehubwrapper.server.tohl.Workspace;
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceFolder;
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem;
import org.gcube.common.storagehubwrapper.shared.tohl.items.FileItem;
import org.gcube.common.storagehubwrapper.shared.tohl.items.FileItemType;
import org.gcube.portlets.user.performfish.util.PFISHConstants;
import org.gcube.portlets.user.performfish.util.Utils;
import org.gcube.vomanagement.usermanagement.RoleManager;
@ -35,7 +37,6 @@ import com.liferay.portal.kernel.json.JSONFactoryUtil;
import com.liferay.portal.kernel.json.JSONObject;
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.servlet.ServletResponseUtil;
import com.liferay.portal.kernel.upload.FileItem;
import com.liferay.portal.kernel.upload.UploadPortletRequest;
import com.liferay.portal.kernel.util.FileUtil;
import com.liferay.portal.kernel.util.GetterUtil;
@ -53,8 +54,6 @@ public class EmptyFormsDocumentsDisplay extends MVCPortlet {
public static final String FOLDERID_PREFERENCE_ATTR_NAME = "folderId";
private final static String RESOURCE_URL_ID = "uploadFiles";
private final static String UPLOADED_FILE_ATTR_NAME = "myfile";
private static String XLS_MIMETYPE = "application/vnd.ms-excel";
private static String XLSX_MIMETYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
public static final String ATTACHMENT_FOLDER ="_uploaded_forms";
private static RoleManager RM = new LiferayRoleManager();
@Override
@ -86,9 +85,11 @@ public class EmptyFormsDocumentsDisplay extends MVCPortlet {
setGuestAuthorizationToken(request);
PortletPreferences portletPreferences = request.getPreferences();
String folderId = GetterUtil.getString(portletPreferences.getValue(FOLDERID_PREFERENCE_ATTR_NAME, StringPool.BLANK));
_log.info("\n\n *** folderId with empty forms:" + folderId);
if (folderId != null && !folderId.equals("")) {
String context = Utils.getCurrentContext(request);
Workspace ws = Utils.getWS("guest", context) ;
String username = Utils.getCurrentUser(request).getUsername();
Workspace ws = Utils.getWS(username, context) ;
String selectedPhase = GetterUtil.getString(portletPreferences.getValue(PFISHConstants.PHASE_PREFERENCE_ATTR_NAME, StringPool.BLANK));
//in theChildren expected to find 3 subfolders: Utils.SHOW_HATCHERY, SHOW_PRE_ONGROWING ..
@ -99,12 +100,12 @@ public class EmptyFormsDocumentsDisplay extends MVCPortlet {
List<FileItem> theInstructions = new ArrayList<>();
List<String >theSheetNames = new ArrayList<>();
//separate from instructions
for (WorkspaceItem workspaceItem : thefiles) {
for (WorkspaceItem workspaceItem : thefiles) {
if (workspaceItem instanceof FileItem) {
FileItem file = (FileItem) workspaceItem;
if (file.getContentType().equals(XLS_MIMETYPE) || file.getContentType().equals(XLSX_MIMETYPE)) { //is a form
if (file.getFileItemType() == FileItemType.DOCUMENT) { //is a form
theSheets.add(file);
theSheetNames.add("'"+file.getFileName()+"'"); //serializing for Javascript
theSheetNames.add("'"+file.getName()+"'"); //serializing for Javascript
}
else
theInstructions.add(file);
@ -137,7 +138,7 @@ public class EmptyFormsDocumentsDisplay extends MVCPortlet {
UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(resourceRequest);
File multipartFile = uploadRequest.getFile(UPLOADED_FILE_ATTR_NAME);
FileItem[] items = uploadRequest.getMultipartParameterMap().get(UPLOADED_FILE_ATTR_NAME);
com.liferay.portal.kernel.upload.FileItem[] items = uploadRequest.getMultipartParameterMap().get(UPLOADED_FILE_ATTR_NAME);
String fileName = "";
String contentType = "";
for (int i = 0; i < items.length; i++) {
@ -180,7 +181,7 @@ public class EmptyFormsDocumentsDisplay extends MVCPortlet {
InputStream is = ws.downloadFile(fileToDownloadId, theItem.getName(), null, null).getStream();
HttpServletResponse httpRes = PortalUtil.getHttpServletResponse(resourceResponse);
HttpServletRequest httpReq = PortalUtil.getHttpServletRequest(resourceRequest);
ServletResponseUtil.sendFile(httpReq,httpRes, file.getFileName(), is, "application/download");
ServletResponseUtil.sendFile(httpReq,httpRes, file.getName(), is, "application/download");
}
} catch (Exception e) {
e.printStackTrace();
@ -195,8 +196,9 @@ public class EmptyFormsDocumentsDisplay extends MVCPortlet {
* @return
*/
private void setGuestAuthorizationToken(RenderRequest request) {
String scope = Utils.getCurrentContext(request);
String authorizationToken = Utils.getCurrentUserToken(scope, "guest");
String context = Utils.getCurrentContext(request);
String username = Utils.getCurrentUser(request).getUsername();
String authorizationToken = Utils.getCurrentUserToken(context, username);
SecurityTokenProvider.instance.set(authorizationToken);
}

4
src/main/java/org/gcube/portlets/user/performfish/SubmittedFormValidation.java
Unescape Escape View File

@ -69,8 +69,8 @@ public class SubmittedFormValidation extends MVCPortlet {
GCubeTeam theFarm = null;
theCompany = Utils.checkBelongingToOneCompanyOnly(request, response, this);
request.setAttribute("theCompany", TeamLocalServiceUtil.getTeam(theCompany.getTeamId()));
if (farmIds == null || farmIds.length == 0) {
System.out.println("farmIds == null || farmIds.length == 0");
if (Utils.getUserFarmsNumber(request, response, this) < 2) {
theFarm = Utils.checkBelongingToOneFarmOnly(request, response, this);
request.setAttribute("theFarm", theFarm); //pass to the JSP
@ -161,7 +161,7 @@ public class SubmittedFormValidation extends MVCPortlet {
Workspace ws = Utils.getWS(username, context);
WorkspaceFolder companyRepoFolder = Utils.getWSFarmFolder(username, context, theCompany, theFarm);
String toReturn = "";
WorkspaceItem item = ws.uploadFile(context, fileData, fileName, "User form submission on " + new Date());
WorkspaceItem item = ws.uploadFile(companyRepoFolder.getId(), fileData, fileName, "User form submission on " + new Date());
//ExternalFile item = companyRepoFolder.createExternalFileItem(fileName, "User form submission on " + new Date(), XSLX_MIME, fileData);
toReturn = item.getId();
_log.info("Uploaded " + fileName + " - Returned Workspace id=" +toReturn);

25
src/main/java/org/gcube/portlets/user/performfish/util/Utils.java
Unescape Escape View File

@ -28,14 +28,14 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.common.portal.PortalContext;
import org.gcube.common.resources.gcore.GCoreEndpoint;
import org.gcube.common.resources.gcore.ServiceEndpoint;
import org.gcube.common.resources.gcore.GCoreEndpoint.Profile.Endpoint;
import org.gcube.common.resources.gcore.ServiceEndpoint;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.common.storagehubwrapper.server.StorageHubWrapper;
import org.gcube.common.storagehubwrapper.server.tohl.Workspace;
import org.gcube.common.storagehubwrapper.shared.ACLType;
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceFolder;
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceSharedFolder;
import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem;
import org.gcube.portlets.user.performfish.bean.Association;
import org.gcube.portlets.user.performfish.bean.Company;
import org.gcube.portlets.user.performfish.bean.CompanyMember;
@ -121,14 +121,14 @@ public class Utils {
}
if (teams.isEmpty()) {
_log.info("NOT BELONGING TO ANY TEAM");
_log.warn("NOT BELONGING TO ANY TEAM");
PortletRequestDispatcher dispatcher = instance.getPortletContext().getRequestDispatcher(NOT_BELONGING_PAGE_PATH);
dispatcher.include(request, response);
return null;
}
List<GCubeTeam> companiesChecker = new ArrayList<>(); //this at then end must be length 1
if (teams.size() > 0) {
_log.info("Checking company ...");
_log.debug("Checking company ...");
Connection conn;
try {
conn = DatabaseConnection.getInstance(Utils.getCurrentContext(groupId)).getConnection();
@ -136,7 +136,7 @@ public class Utils {
for (GCubeTeam team : teams) {
for (Company company : companies) {
if (team.getTeamId() == company.getCompanyId()) {
_log.info(currentUser.getUsername() + " belongs to company ..." + team.getTeamName());
_log.debug(currentUser.getUsername() + " belongs to company ..." + team.getTeamName());
companiesChecker.add(team);
}
}
@ -692,7 +692,7 @@ public class Utils {
SecurityTokenProvider.instance.set(authorizationToken);
ScopeProvider.instance.set(context);
try {
StorageHubWrapper wrap = new StorageHubWrapper(currentUsername, authorizationToken);
StorageHubWrapper wrap = new StorageHubWrapper(context, authorizationToken);
return wrap.getWorkspace();
}
catch (Exception e) {
@ -714,12 +714,12 @@ public class Utils {
Workspace ws = null;
WorkspaceFolder folder = null;
String companyName = team.getTeamName();
try {
ws = getWS(currentUsername, context);
try {
ws = getWS(username, context);
String destinationFolderId = ws.getRoot().getId();
String name = companyName+PFISHConstants.COMPANY_WS_FOLDER_SUFFIX;
String description = "Data belonging to " + companyName;
if (!ws.exists(name, destinationFolderId)) {
_log.info(companyName + " company folder does not exists, triggering creation ... ");
folder = ws.createFolder(name, description, destinationFolderId);
@ -736,7 +736,8 @@ public class Utils {
}
else {
_log.info(companyName + " company folder exists, returning id and setting hidden?... " + PFISHConstants.HIDE_COMPANY_SHARED_FOLDER);
folder = (WorkspaceFolder) ws.find(name, destinationFolderId);
List<WorkspaceItem> folders = ws.find(name, destinationFolderId);
folder = (WorkspaceFolder) folders.get(0);
ws.setFolderAsHidden(folder.getId(), PFISHConstants.HIDE_COMPANY_SHARED_FOLDER);
}
}
@ -758,7 +759,6 @@ public class Utils {
String authorizationToken = PortalContext.getConfiguration().getCurrentUserToken(context, username);
SecurityTokenProvider.instance.set(authorizationToken);
ScopeProvider.instance.set(context);
Workspace ws = null;
WorkspaceFolder folder = null;
String companyName = company.getTeamName();
@ -780,7 +780,8 @@ public class Utils {
_log.info(farm.getTeamName() + " farm folder exists, returning id ... ");
SecurityTokenProvider.instance.set(authorizationToken);
ScopeProvider.instance.set(context);
folder = (WorkspaceFolder) ws.find(name, destinationFolderId);
List<WorkspaceItem> folders = ws.find(name, destinationFolderId);
folder = (WorkspaceFolder) folders.get(0);
ws.setFolderAsHidden(folder.getId(), PFISHConstants.HIDE_COMPANY_SHARED_FOLDER);
_log.info(farm.getTeamName() + " farm folder id = " + folder.getId());
}

15
src/main/webapp/html/companyprivaterepository/company_private_repository.jsp
Unescape Escape View File

@ -2,7 +2,7 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet">
<%
LinkedHashMap<Farm, List<ExternalFile>> companyFiles = (LinkedHashMap<Farm, List<ExternalFile>>) renderRequest
LinkedHashMap<Farm, List<FileItem>> companyFiles = (LinkedHashMap<Farm, List<FileItem>>) renderRequest
.getAttribute("companyPrivateFiles");
pageContext.setAttribute("companyFiles", companyFiles);
pageContext.setAttribute("logoURL", renderRequest.getAttribute("companyLogoURL"));
@ -73,12 +73,13 @@
<portlet:param name="fileToDownloadId" value="${file.id}" />
</portlet:resourceURL>
<%
ExternalFile item = (ExternalFile) pageContext.getAttribute("file");
String iconHTML = IconsManager.getMDIconTextualName(item.getName()).getHtml();
String fullName = Utils.getUserByUsername(item.getLastUpdatedBy()).getFullname();
String userProfileLink = Utils.getUserProfileLink(item.getLastUpdatedBy());
Date lastUpdated = new Date(item.getLastModificationTime().getTimeInMillis());
pageContext.setAttribute("lastUpdated", lastUpdated);
FileItem item = (FileItem) pageContext.getAttribute("file");
String iconHTML = IconsManager.getMDIconTextualName(item.getName()).getHtml();
String fullName = "";
fullName = Utils.getUserByUsername(item.getOwner()).getFullname();
String userProfileLink = Utils.getUserProfileLink(item.getOwner());
Date lastUpdated = new Date(item.getLastModificationTime().getTimeInMillis());
pageContext.setAttribute("lastUpdated", lastUpdated);
%>
<td><input type="radio" name="fileItem" value="${file.id}"
id="${downloadFileURL}" style="margin: 4px 5px 10px;"></td>

16
src/main/webapp/html/companyprivaterepository/show_all_versions.jsp
Unescape Escape View File

@ -10,7 +10,7 @@
long currentGroupId = group.getGroupId();
String currentURL = PortalUtil.getCurrentURL(request);
pageContext.setAttribute("currentURL",currentURL);
List<WorkspaceVersion> fileVersions = (List<WorkspaceVersion>) renderRequest.getAttribute("versions");
List<WorkspaceFileVersion> fileVersions = (List<WorkspaceFileVersion>) renderRequest.getAttribute("versions");
if (fileVersions != null)
Collections.reverse(fileVersions);
pageContext.setAttribute("fileVersions", fileVersions);
@ -29,25 +29,15 @@
<thead>
<th colspan="2">
Version Number</th>
<th><span style="margin-left: 10px; font-size: 1.1em;">Created by
</span></th>
<th><span style="margin-left: 10px; font-size: 1.1em;">Created date (UTC)</span></th>
<th><span style="margin-left: 10px; font-size: 1.1em;">Current</span></th>
</thead>
<c:forEach var="file" items="${fileVersions}">
<tr>
<%
WorkspaceVersion version = (WorkspaceVersion) pageContext.getAttribute("file");
WorkspaceFileVersion version = (WorkspaceFileVersion) pageContext.getAttribute("file");
Date created = new Date(version.getCreated().getTimeInMillis());
pageContext.setAttribute("created", created);
String fullName = "";
String userProfileLink = "";
if (version.getUser() != null) {
fullName = Utils.getUserByUsername(version.getUser()).getFullname();
userProfileLink = Utils.getUserProfileLink(version.getUser());
}
pageContext.setAttribute("fullName", fullName);
pageContext.setAttribute("userProfileLink", userProfileLink);
%>
<portlet:resourceURL var="downloadVersionURL">
<portlet:param name="versionDownloadItemId" value="${selectedItemId}" />
@ -57,8 +47,6 @@
<td><span style="font-size: 1.1em;"><a
href="javascript:downloadVersion('${downloadVersionURL}');"
title="Download version ${file.name}">${file.name}</a></span></td>
<td><span style="margin-left: 10px; font-size: 1.1em;"><a
href="<%=userProfileLink%>" target="_blank"><%=fullName%></a></span></td>
<td><span
style="margin-left: 10px; font-size: 1.1em; color: #666;"><fmt:formatDate
type="both" dateStyle="medium" timeStyle="short"

4
src/main/webapp/html/emptyformsdocumentsdisplay/empty_forms_fileupload_display.jsp
Unescape Escape View File

@ -2,11 +2,11 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet">
<%
List<ExternalFile> theSheets = (List<ExternalFile>) renderRequest.getAttribute("thefiles");
List<FileItem> theSheets = (List<FileItem>) renderRequest.getAttribute("thefiles");
List<String> theSheetNames = (List<String>) renderRequest.getAttribute("theSheetNames");
pageContext.setAttribute("theSheetNames", theSheetNames);
pageContext.setAttribute("theSheets", theSheets);
List<ExternalFile> theInstructions = (List<ExternalFile>) renderRequest.getAttribute("theInstructions");
List<FileItem> theInstructions = (List<FileItem>) renderRequest.getAttribute("theInstructions");
pageContext.setAttribute("theInstructions", theInstructions);
String selectedPhase = GetterUtil.getString(portletPreferences.getValue(PFISHConstants.PHASE_PREFERENCE_ATTR_NAME, StringPool.BLANK));
pageContext.setAttribute("selectedPhase", selectedPhase);

16
src/main/webapp/html/farmrepository/show_all_versions.jsp
Unescape Escape View File

@ -10,7 +10,7 @@
long currentGroupId = group.getGroupId();
String currentURL = PortalUtil.getCurrentURL(request);
pageContext.setAttribute("currentURL",currentURL);
List<WorkspaceVersion> fileVersions = (List<WorkspaceVersion>) renderRequest.getAttribute("versions");
List<WorkspaceFileVersion> fileVersions = (List<WorkspaceFileVersion>) renderRequest.getAttribute("versions");
if (fileVersions != null)
Collections.reverse(fileVersions);
pageContext.setAttribute("fileVersions", fileVersions);
@ -26,25 +26,15 @@
<thead>
<th colspan="2">
Version Number</th>
<th><span style="margin-left: 10px; font-size: 1.1em;">Created by
</span></th>
<th><span style="margin-left: 10px; font-size: 1.1em;">Created date (UTC)</span></th>
<th><span style="margin-left: 10px; font-size: 1.1em;">Current</span></th>
</thead>
<c:forEach var="file" items="${fileVersions}">
<tr>
<%
WorkspaceVersion version = (WorkspaceVersion) pageContext.getAttribute("file");
WorkspaceFileVersion version = (WorkspaceFileVersion) pageContext.getAttribute("file");
Date created = new Date(version.getCreated().getTimeInMillis());
pageContext.setAttribute("created", created);
String fullName = "";
String userProfileLink = "";
if (version.getUser() != null) {
fullName = Utils.getUserByUsername(version.getUser()).getFullname();
userProfileLink = Utils.getUserProfileLink(version.getUser());
}
pageContext.setAttribute("fullName", fullName);
pageContext.setAttribute("userProfileLink", userProfileLink);
%>
<portlet:resourceURL var="downloadVersionURL">
<portlet:param name="versionDownloadItemId" value="${selectedItemId}" />
@ -54,8 +44,6 @@
<td><span style="font-size: 1.1em;"><a
href="javascript:downloadVersion('${downloadVersionURL}');"
title="Download version ${file.name}">${file.name}</a></span></td>
<td><span style="margin-left: 10px; font-size: 1.1em;"><a
href="<%=userProfileLink%>" target="_blank"><%=fullName%></a></span></td>
<td><span
style="margin-left: 10px; font-size: 1.1em; color: #666;"><fmt:formatDate
type="both" dateStyle="medium" timeStyle="short"

19
src/main/webapp/html/farmrepository/view_farm_repository.jsp
Unescape Escape View File

@ -16,8 +16,7 @@
pageContext.setAttribute("farmyName", theFarm.getTeamName());
pageContext.setAttribute("farmId", theFarm.getTeamId());
}
Group group = (Group) GroupLocalServiceUtil.getGroup(PortalUtil.getScopeGroupId(request));
long currentGroupId = group.getGroupId();
long currentGroupId = (Long) renderRequest.getAttribute("currGroupidFarmRepo");
String currentURL = PortalUtil.getCurrentURL(request);
pageContext.setAttribute("AnalyticalToolkitPortletEndpoint", Utils.ANALYTICAL_TOOLKIT_PORTLET_ENDPOINT);
pageContext.setAttribute("farmIdParamEncoded", Utils.maskId("farmid"));
@ -85,6 +84,7 @@ $(function () {
windowState="<%=LiferayWindowState.NORMAL.toString()%>" />
<c:set var="maximised" scope="session"
value="${renderRequest.getWindowState().toString().equalsIgnoreCase('maximized')}" />
<c:if test="${not empty farmyName}">
<div style="text-align: center; padding-bottom: 15px;">
<table>
@ -114,8 +114,7 @@ $(function () {
<th>Sel.</th>
<th></th>
<th>Name</th>
<th><span title="UTC: Universal Time Coordinates" style="margin-left: 10px;">Uploaded
by (UTC)</span></th>
<th><span title="UTC: Universal Time Coordinates" style="margin-left: 10px;">Owned by (UTC)</span></th>
<th><span title="UTC: Universal Time Coordinates" style="margin-left: 10px;">Published by (UTC)</span></th>
<th><span style="margin-left: 10px; ">Publishing Status</span></th>
</thead>
@ -123,16 +122,11 @@ $(function () {
<c:set var="buttonDisabled" value=""/>
<%
SubmittedForm submittedForm = (SubmittedForm) pageContext.getAttribute("form");
ExternalFile item = submittedForm.getFormFile();
FileItem item = submittedForm.getFormFile();
String iconHTML = IconsManager.getMDIconTextualName(item.getName()).getHtml();
String fullName = "";
if (item.getVersionHistory() != null && item.getVersionHistory().size() > 0) {
WorkspaceVersion v = item.getVersionHistory().get(item.getVersionHistory().size()-1);
fullName = Utils.getUserByUsername(v.getUser()).getFullname();
} else {
fullName = Utils.getUserByUsername(item.getLastUpdatedBy()).getFullname();
}
String userProfileLink = Utils.getUserProfileLink(item.getLastUpdatedBy());
fullName = Utils.getUserByUsername(item.getOwner()).getFullname();
String userProfileLink = Utils.getUserProfileLink(item.getOwner());
long timeInMillis = item.getLastModificationTime().getTimeInMillis();
Date lastUpdated = new Date(timeInMillis);
//needed to check if publishing occurs after the validation
@ -269,4 +263,3 @@ $(function () {
</div>
</c:if>

7
src/main/webapp/html/init.jsp
Unescape Escape View File

@ -58,9 +58,10 @@
<%@page import="org.gcube.portlets.user.performfish.util.db.DBUtil"%>
<%@page import="org.gcube.portlets.user.performfish.util.PFISHConstants"%>
<%@page import=" org.gcube.portlets.user.performfish.bean.*"%>
<%-- <%@page import="org.gcube.common.homelibrary.home.workspace.WorkspaceItem"%> --%>
<%-- <%@page import="org.gcube.common.homelibary.model.versioning.WorkspaceVersion"%> --%>
<%-- <%@page import="org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile"%> --%>
<%@page import="org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem"%>
<%@page import="org.gcube.common.storagehubwrapper.shared.tohl.items.FileItem"%>
<%@page import="org.gcube.common.storagehubwrapper.shared.tohl.impl.WorkspaceFileVersion"%>
<%@page import="org.gcube.portal.stohubicons.IconsManager"%>
<%@page import="org.gcube.common.storagehub.model.items.GenericFileItem"%>

3
src/main/webapp/html/submittedformvalidation/validation.jsp
Unescape Escape View File

@ -4,7 +4,8 @@
Team theCompany = (Team) request.getAttribute("theCompany");
pageContext.setAttribute("companyId", theCompany.getTeamId());
GCubeTeam theFarm = (GCubeTeam) request.getAttribute("theFarm");
pageContext.setAttribute("farmId", theFarm.getTeamId());
if (theFarm != null)
pageContext.setAttribute("farmId", theFarm.getTeamId());
%>
<portlet:resourceURL var="validateFileURL">

Write Preview
Loading…
Cancel
Save