gCubeSystem
/
accept-invite-portlet
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

works! 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/accept-invite-portlet@160095 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2017-12-05 18:19:57 +00:00
parent 4bf9153c45
commit 4aa47b4a30
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java
View File

@ -189,7 +189,7 @@ public class PortletViewController {
} }
//checking if the user has been already registered or is already in the portal //checking if the user has been already registered or is already in the portal
GCubeUser theUser = register(firstName, lastName, email, password); User theUser = register(firstName, lastName, email, password);
if (theUser != null) if (theUser != null)
response.getWriter().println("OK"); response.getWriter().println("OK");
else else
@ -202,8 +202,8 @@ public class PortletViewController {
return matcher.find(); return matcher.find();
} }
private GCubeUser register(String firstName, String lastName, String email, String password1) { private User register(String firstName, String lastName, String email, String password1) {
GCubeUser toReturn = null; User toReturn = null;
try{ try{
_log.debug("Trying createuser " + email); _log.debug("Trying createuser " + email);
Long defaultCompanyId = PortalUtil.getDefaultCompanyId(); Long defaultCompanyId = PortalUtil.getDefaultCompanyId();
@ -217,7 +217,7 @@ public class PortletViewController {
int birthdayDay = 1; int birthdayDay = 1;
int birthdayYear = 1970; int birthdayYear = 1970;
String password2 = password1; String password2 = password1;
User added = UserLocalServiceUtil.addUser( toReturn = UserLocalServiceUtil.addUser(
defaultUserId, defaultUserId,
defaultCompanyId, defaultCompanyId,
autoPassword, autoPassword,
@ -246,8 +246,8 @@ public class PortletViewController {
true, true,
new ServiceContext()); new ServiceContext());
_log.debug("CreateUser " + lastName + " SUCCESS"); _log.debug("CreateUser " + lastName + " SUCCESS");
UserLocalServiceUtil.updateAgreedToTermsOfUse(added.getUserId(), false); UserLocalServiceUtil.updateAgreedToTermsOfUse(toReturn.getUserId(), false);
UserLocalServiceUtil.updatePasswordReset(added.getUserId(), false); UserLocalServiceUtil.updatePasswordReset(toReturn.getUserId(), false);
} }
catch(Exception e){ catch(Exception e){

3
src/main/webapp/WEB-INF/jsp/view.jsp
View File

@ -30,7 +30,8 @@
}, },
success : function(data) { success : function(data) {
$('#loadingAjaxCallback').css("display", "none"); $('#loadingAjaxCallback').css("display", "none");
if (data == "OK") { var result = data.toString().trim();
if (result == "OK") {
$('#successDiv').css("display", "block"); $('#successDiv').css("display", "block");
} else { } else {
$('#errorDiv').css("display", "block"); $('#errorDiv').css("display", "block");