gCubeSystem
/
about-vre
16
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2016-03-29 13:07:50 +00:00
parent 565b82ba8d
commit 0dd44e1c95
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml
View File

@ -12,7 +12,7 @@
<b:ControlGroup> <b:ControlGroup>
<b:Paragraph> <b:Paragraph>
<b:Button type="LINK" visible="false" ui:field="seeMore">See more</b:Button> <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:Paragraph>
</b:ControlGroup> </b:ControlGroup>
</b:Caption> </b:Caption>

23
src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java
View File

@ -139,27 +139,6 @@ public class LoggedinServiceImpl extends RemoteServiceServlet implements Loggedi
currSite.isRequestBasedGroup()); currSite.isRequestBasedGroup());
return vre; 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 *@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(); UserManager userM = new LiferayUserManager();
try { try {
userM.dismissUserFromGroup(getCurrentGroupID(), userM.getUserId(username)); 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 "/"; return "/";
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();