From 0dd44e1c95925a17628a84f44f00fc36b10e23b3 Mon Sep 17 00:00:00 2001
From: "massimiliano.assante" <massimiliano.assante@isti.cnr.it>
Date: Tue, 29 Mar 2016 13:07:50 +0000
Subject: [PATCH] updated leave group text

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gcube-loggedin@126350 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../gcubeloggedin/client/ui/AboutView.ui.xml  |  2 +-
 .../server/LoggedinServiceImpl.java           | 23 +------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml b/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml
index 69308bd..5172a33 100644
--- a/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml
@@ -12,7 +12,7 @@
 			<b:ControlGroup>
 				<b:Paragraph>
 					<b:Button type="LINK" visible="false" ui:field="seeMore">See more</b:Button>
-					<b:Button type="LINK" visible="false" ui:field="leaveButton">Leave this group</b:Button>
+					<b:Button type="LINK" visible="false" ui:field="leaveButton">Unregister from this group</b:Button>
 				</b:Paragraph>
 			</b:ControlGroup>
 		</b:Caption>
diff --git a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java
index 92a7999..01424ef 100644
--- a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java
@@ -139,27 +139,6 @@ public class LoggedinServiceImpl extends RemoteServiceServlet implements Loggedi
 				currSite.isRequestBasedGroup());
 		return vre;
 	}
-	/**
-	 * 
-	 * @return the portal basic url, e.g. http://www.foo.com
-	 */
-	private String getPortalBasicUrl() {
-		HttpServletRequest request = this.getThreadLocalRequest();
-		String toReturn = "";
-		//protocol
-		String protocol = (request.isSecure()) ? "https://" : "http://" ;
-		toReturn += protocol;
-		//server name
-		toReturn += request.getServerName();
-		//port
-		toReturn +=  (request.getServerPort() == 80) ? "" : ":"+request.getServerPort() ;
-
-		request.getQueryString();
-
-		_log.trace("\n getPortalBasicUrl: " +toReturn + "queryString: " +	request.getQueryString());
-		return toReturn;
-	}
-
 	/**
 	 *@return the redirect url if everything goes ok, null otherwise
 	 */
@@ -172,7 +151,7 @@ public class LoggedinServiceImpl extends RemoteServiceServlet implements Loggedi
 		UserManager userM = new LiferayUserManager();
 		try {
 			userM.dismissUserFromGroup(getCurrentGroupID(), userM.getUserId(username));
-			sendUserUnregisteredNotification(username, getASLSession().getScope(), getPortalBasicUrl(), PortalContext.getConfiguration().getGatewayName());
+			sendUserUnregisteredNotification(username, getASLSession().getScope(), PortalContext.getConfiguration().getGatewayURL(getThreadLocalRequest()), PortalContext.getConfiguration().getGatewayName());
 			return "/";
 		} catch (Exception e) {
 			e.printStackTrace();