From 4096c01153533869ff2051edf49131f34e012906 Mon Sep 17 00:00:00 2001 From: N Smith Date: Wed, 30 Nov 2011 17:08:52 +0000 Subject: [PATCH] ALF-9315 Invitation accept/reject URLs were being created on the client but are now correctly created on the server. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/invitation/AbstractInvitationServiceImplTest.java | 2 +- source/java/org/alfresco/repo/site/script/Site.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java b/source/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java index c80b5f9772..d747c6f0c2 100644 --- a/source/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java +++ b/source/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java @@ -527,7 +527,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri String acceptUrl = "froob"; String rejectUrl = "marshmallow"; String expectedUserName = (inviteeFirstName + "_" + inviteeLastName).toLowerCase(); - + expectedUserName = expectedUserName.replaceAll("\\s+", "_"); authenticationComponent.setCurrentUser(USER_MANAGER); NominatedInvitation nominatedInvitation = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, diff --git a/source/java/org/alfresco/repo/site/script/Site.java b/source/java/org/alfresco/repo/site/script/Site.java index 996457d41e..e1970816c9 100644 --- a/source/java/org/alfresco/repo/site/script/Site.java +++ b/source/java/org/alfresco/repo/site/script/Site.java @@ -51,6 +51,7 @@ import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.namespace.QName; +import org.alfresco.util.UrlUtil; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; import org.springframework.extensions.surf.util.ParameterCheck; @@ -734,6 +735,7 @@ public class Site implements Serializable */ public ScriptInvitation inviteNominated(String inviteeFirstName, String inviteeLastName, String inviteeEmail, String inviteeRole, String serverPath, String acceptUrl, String rejectUrl) { + serverPath = UrlUtil.getShareUrl(serviceRegistry.getSysAdminParams()); Invitation invitation = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, getShortName(), inviteeRole, serverPath, acceptUrl, rejectUrl); return scriptInvitationFactory.toScriptInvitation(invitation); }