@@ -57,8 +47,6 @@
${file.name} |
- <%=fullName%> |
<%
- List theSheets = (List) renderRequest.getAttribute("thefiles");
+ List theSheets = (List) renderRequest.getAttribute("thefiles");
List theSheetNames = (List) renderRequest.getAttribute("theSheetNames");
pageContext.setAttribute("theSheetNames", theSheetNames);
pageContext.setAttribute("theSheets", theSheets);
- List theInstructions = (List) renderRequest.getAttribute("theInstructions");
+ List theInstructions = (List) renderRequest.getAttribute("theInstructions");
pageContext.setAttribute("theInstructions", theInstructions);
String selectedPhase = GetterUtil.getString(portletPreferences.getValue(PFISHConstants.PHASE_PREFERENCE_ATTR_NAME, StringPool.BLANK));
pageContext.setAttribute("selectedPhase", selectedPhase);
diff --git a/src/main/webapp/html/farmrepository/show_all_versions.jsp b/src/main/webapp/html/farmrepository/show_all_versions.jsp
index a84c309..595b9c2 100644
--- a/src/main/webapp/html/farmrepository/show_all_versions.jsp
+++ b/src/main/webapp/html/farmrepository/show_all_versions.jsp
@@ -10,7 +10,7 @@
long currentGroupId = group.getGroupId();
String currentURL = PortalUtil.getCurrentURL(request);
pageContext.setAttribute("currentURL",currentURL);
- List fileVersions = (List) renderRequest.getAttribute("versions");
+ List fileVersions = (List) renderRequest.getAttribute("versions");
if (fileVersions != null)
Collections.reverse(fileVersions);
pageContext.setAttribute("fileVersions", fileVersions);
@@ -26,25 +26,15 @@
Version Number |
- Created by
- |
Created date (UTC) |
Current |
<%
- 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);
%>
@@ -54,8 +44,6 @@
${file.name} |
- <%=fullName%> |
+
@@ -114,8 +114,7 @@ $(function () {
Sel. |
|
Name |
- Uploaded
- by (UTC) |
+ Owned by (UTC) |
Published by (UTC) |
Publishing Status |
@@ -123,16 +122,11 @@ $(function () {
<%
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 () {
-
diff --git a/src/main/webapp/html/init.jsp b/src/main/webapp/html/init.jsp
index 7dd60f7..6eecafe 100644
--- a/src/main/webapp/html/init.jsp
+++ b/src/main/webapp/html/init.jsp
@@ -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"%>
diff --git a/src/main/webapp/html/submittedformvalidation/validation.jsp b/src/main/webapp/html/submittedformvalidation/validation.jsp
index 97de961..7ca7825 100644
--- a/src/main/webapp/html/submittedformvalidation/validation.jsp
+++ b/src/main/webapp/html/submittedformvalidation/validation.jsp
@@ -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());
%>
| |