Massimiliano Assante 2016-03-23 16:03:19 +00:00
parent 49075a906a
commit 4233327568
2 changed files with 8 additions and 3 deletions

View File

@ -121,6 +121,11 @@
<groupId>javax.portlet</groupId> <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId> <artifactId>portlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.dvos</groupId>
<artifactId>usermanagement-core</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.liferay.portal</groupId> <groupId>com.liferay.portal</groupId>

View File

@ -8,11 +8,11 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portal.databook.shared.InviteOperationResult; import org.gcube.portal.databook.shared.InviteOperationResult;
import org.gcube.portal.invites.InvitesManager; import org.gcube.portal.invites.InvitesManager;
import org.gcube.portlets.widgets.inviteswidget.client.InviteService; import org.gcube.portlets.widgets.inviteswidget.client.InviteService;
import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.google.gwt.user.server.rpc.RemoteServiceServlet;
import com.liferay.portal.service.OrganizationLocalServiceUtil;
import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.PortalUtil;
@ -50,10 +50,10 @@ public class InviteServiceImpl extends RemoteServiceServlet implements InviteSer
String lowercaseEmail = email.toLowerCase(); String lowercaseEmail = email.toLowerCase();
String portalUrl = null; String portalUrl = null;
String vreDescription = null; String vreDescription = null;
long organizationId = getASLSession().getGroupId(); long groupId = getASLSession().getGroupId();
try { try {
portalUrl = PortalUtil.getPortalURL(SiteManagerUtil.getCompany().getVirtualHostname(), 443, true); portalUrl = PortalUtil.getPortalURL(SiteManagerUtil.getCompany().getVirtualHostname(), 443, true);
vreDescription = OrganizationLocalServiceUtil.getOrganization(organizationId).getComments(); vreDescription = new LiferayGroupManager().getGroup(groupId).getDescription();
} catch (Exception e1) { } catch (Exception e1) {
e1.printStackTrace(); e1.printStackTrace();
_log.warn("While trying to send email for invitation to " + lowercaseEmail); _log.warn("While trying to send email for invitation to " + lowercaseEmail);