diff --git a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java index 119c878..da4e461 100644 --- a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java +++ b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java @@ -189,7 +189,7 @@ public class PortletViewController { } //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) response.getWriter().println("OK"); else @@ -202,8 +202,8 @@ public class PortletViewController { return matcher.find(); } - private GCubeUser register(String firstName, String lastName, String email, String password1) { - GCubeUser toReturn = null; + private User register(String firstName, String lastName, String email, String password1) { + User toReturn = null; try{ _log.debug("Trying createuser " + email); Long defaultCompanyId = PortalUtil.getDefaultCompanyId(); @@ -217,7 +217,7 @@ public class PortletViewController { int birthdayDay = 1; int birthdayYear = 1970; String password2 = password1; - User added = UserLocalServiceUtil.addUser( + toReturn = UserLocalServiceUtil.addUser( defaultUserId, defaultCompanyId, autoPassword, @@ -246,8 +246,8 @@ public class PortletViewController { true, new ServiceContext()); _log.debug("CreateUser " + lastName + " SUCCESS"); - UserLocalServiceUtil.updateAgreedToTermsOfUse(added.getUserId(), false); - UserLocalServiceUtil.updatePasswordReset(added.getUserId(), false); + UserLocalServiceUtil.updateAgreedToTermsOfUse(toReturn.getUserId(), false); + UserLocalServiceUtil.updatePasswordReset(toReturn.getUserId(), false); } catch(Exception e){ diff --git a/src/main/webapp/WEB-INF/jsp/view.jsp b/src/main/webapp/WEB-INF/jsp/view.jsp index 51f93b4..d5988ef 100644 --- a/src/main/webapp/WEB-INF/jsp/view.jsp +++ b/src/main/webapp/WEB-INF/jsp/view.jsp @@ -30,7 +30,8 @@ }, success : function(data) { $('#loadingAjaxCallback').css("display", "none"); - if (data == "OK") { + var result = data.toString().trim(); + if (result == "OK") { $('#successDiv').css("display", "block"); } else { $('#errorDiv').css("display", "block");