From 52fcada265b50be4fd30293f6e8b6fe00e33a29a Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 20 Jun 2018 14:52:20 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/sbd-uploadshare-portlet@169353
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../org/gcube/portlets/user/vremanagement/RequestVRE.java  | 4 ++--
 src/main/webapp/WEB-INF/liferay-portlet.xml                | 4 ++++
 src/main/webapp/html/requestvre/view.jsp                   | 7 ++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java b/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java
index c34429c..a80c83e 100644
--- a/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java
+++ b/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java
@@ -219,7 +219,7 @@ public class RequestVRE extends MVCPortlet {
 		StringBuilder sb = new StringBuilder("Hi, the following VRE was requested by ").append(currentUser.getFullName())
 				.append(" (").append(currentUser.getEmailAddress()).append(").")
 				.append("\n\n").append("VRE name: ").append(vre_name).append("\n")
-				.append("\n").append("Manager(s)").append(vreManagerName).append("\n")
+				.append("\n").append("Manager(s): ").append(vreManagerName).append("\n")
 				.append("\n").append("Abstract:\n").append(theAbstract).append("\n")
 				.append("\n").append("Contact email: ").append(email).append("\n");
 
@@ -235,7 +235,7 @@ public class RequestVRE extends MVCPortlet {
 				workspace.getWorkspaceMessageManager().
 				sendMessageToPortalLogins(subject, body, attachmentsList, recipientIds);
 
-		_log.info("Sending upload method message notification to: " + recipientIds.toString());
+		_log.info("Sending new VRE Request message notification to: " + recipientIds.toString());
 		NotificationsManager nm = new ApplicationNotificationsManager(new SocialNetworkingSite(request), scope, new SocialNetworkingUser(
 				currentUser.getScreenName(), currentUser.getEmailAddress(), currentUser.getFullName(), ""));
 		Thread thread = new Thread(new MessageNotificationsThread(recipients, messageId, subject, body, nm));
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 6bbf0f5..13678be 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -57,7 +57,11 @@
 	<portlet>
 		<portlet-name>request-vre</portlet-name>
 		<icon>/icon.png</icon>
+		<requires-namespaced-parameters>false</requires-namespaced-parameters>
 		<header-portlet-css>/css/main.css</header-portlet-css>
+		<header-portlet-javascript>
+			/js/jquery.min.js
+		</header-portlet-javascript>
 		<footer-portlet-javascript>
 			/js/main.js
 		</footer-portlet-javascript>
diff --git a/src/main/webapp/html/requestvre/view.jsp b/src/main/webapp/html/requestvre/view.jsp
index 1e87d40..2216595 100644
--- a/src/main/webapp/html/requestvre/view.jsp
+++ b/src/main/webapp/html/requestvre/view.jsp
@@ -5,11 +5,12 @@
 <%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@page import="com.liferay.portal.kernel.servlet.SessionErrors"%>
+<%@page import="com.liferay.portal.model.User"%>
 
 <portlet:defineObjects />
 <liferay-theme:defineObjects />
 <portlet:resourceURL var="uploadFileURL" id="uploadFiles" />
-
+<% User currentUser = themeDisplay.getUser();  %>
 <%
 	if (SessionErrors.contains(renderRequest.getPortletSession(), "experiment-form-error")) {
 %>
@@ -75,9 +76,9 @@
 					label="Abstract, 150 to 250 words" value="" required="true"
 					style="width:90%;" />
 				<aui:input name="vre-manager-name"
-					label="Responsible person(s)" value=""
+					label="Responsible person(s)" value="<%=currentUser.getFullName()%>"
 					required="true" style="width:90%;" />
-				<aui:input name="email" value="" label="Contact email (where to reach you)">
+				<aui:input name="email" value="<%=currentUser.getEmailAddress()%>" label="Contact email (where to reach you)"> 
 					<aui:validator name="required" />
 					<aui:validator name="email" />
 				</aui:input>