gCubeSystem
/
sbd-uploadshare-portlet
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/sbd-uploadshare-portlet@169353 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Massimiliano Assante 2018-06-20 14:52:20 +00:00
parent 59ca1a0a3a
commit 52fcada265
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java
View File

@ -219,7 +219,7 @@ public class RequestVRE extends MVCPortlet {
StringBuilder sb = new StringBuilder("Hi, the following VRE was requested by ").append(currentUser.getFullName()) StringBuilder sb = new StringBuilder("Hi, the following VRE was requested by ").append(currentUser.getFullName())
.append(" (").append(currentUser.getEmailAddress()).append(").") .append(" (").append(currentUser.getEmailAddress()).append(").")
.append("\n\n").append("VRE name: ").append(vre_name).append("\n") .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("Abstract:\n").append(theAbstract).append("\n")
.append("\n").append("Contact email: ").append(email).append("\n"); .append("\n").append("Contact email: ").append(email).append("\n");
@ -235,7 +235,7 @@ public class RequestVRE extends MVCPortlet {
workspace.getWorkspaceMessageManager(). workspace.getWorkspaceMessageManager().
sendMessageToPortalLogins(subject, body, attachmentsList, recipientIds); 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( NotificationsManager nm = new ApplicationNotificationsManager(new SocialNetworkingSite(request), scope, new SocialNetworkingUser(
currentUser.getScreenName(), currentUser.getEmailAddress(), currentUser.getFullName(), "")); currentUser.getScreenName(), currentUser.getEmailAddress(), currentUser.getFullName(), ""));
Thread thread = new Thread(new MessageNotificationsThread(recipients, messageId, subject, body, nm)); Thread thread = new Thread(new MessageNotificationsThread(recipients, messageId, subject, body, nm));

4
src/main/webapp/WEB-INF/liferay-portlet.xml
View File

@ -57,7 +57,11 @@
<portlet> <portlet>
<portlet-name>request-vre</portlet-name> <portlet-name>request-vre</portlet-name>
<icon>/icon.png</icon> <icon>/icon.png</icon>
<requires-namespaced-parameters>false</requires-namespaced-parameters>
<header-portlet-css>/css/main.css</header-portlet-css> <header-portlet-css>/css/main.css</header-portlet-css>
<header-portlet-javascript>
/js/jquery.min.js
</header-portlet-javascript>
<footer-portlet-javascript> <footer-portlet-javascript>
/js/main.js /js/main.js
</footer-portlet-javascript> </footer-portlet-javascript>

7
src/main/webapp/html/requestvre/view.jsp
View File

@ -5,11 +5,12 @@
<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%> <%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%>
<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
<%@page import="com.liferay.portal.kernel.servlet.SessionErrors"%> <%@page import="com.liferay.portal.kernel.servlet.SessionErrors"%>
<%@page import="com.liferay.portal.model.User"%>
<portlet:defineObjects /> <portlet:defineObjects />
<liferay-theme:defineObjects /> <liferay-theme:defineObjects />
<portlet:resourceURL var="uploadFileURL" id="uploadFiles" /> <portlet:resourceURL var="uploadFileURL" id="uploadFiles" />
<% User currentUser = themeDisplay.getUser(); %>
<% <%
if (SessionErrors.contains(renderRequest.getPortletSession(), "experiment-form-error")) { if (SessionErrors.contains(renderRequest.getPortletSession(), "experiment-form-error")) {
%> %>
@ -75,9 +76,9 @@
label="Abstract, 150 to 250 words" value="" required="true" label="Abstract, 150 to 250 words" value="" required="true"
style="width:90%;" /> style="width:90%;" />
<aui:input name="vre-manager-name" <aui:input name="vre-manager-name"
label="Responsible person(s)" value="" label="Responsible person(s)" value="<%=currentUser.getFullName()%>"
required="true" style="width:90%;" /> 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="required" />
<aui:validator name="email" /> <aui:validator name="email" />
</aui:input> </aui:input>