From 591adda2529e1613edc53d39bfb831cf88ffcc2b Mon Sep 17 00:00:00 2001
From: N Smith <left@alfresco.com>
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
---
 config/alfresco/web-scripts-application-context.xml  |  1 +
 .../org/alfresco/repo/web/scripts/invite/Invite.java | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index 8e2e442292..f64ae4f174 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -666,6 +666,7 @@
          class="org.alfresco.repo.web.scripts.invite.Invite"
          parent="webscript">
       <property name="invitationService" ref="InvitationService"/>
+      <property name="sysAdminParams" ref="sysAdminParams"/>
    </bean>
    
    <!--                                                                                                       -->
diff --git a/source/java/org/alfresco/repo/web/scripts/invite/Invite.java b/source/java/org/alfresco/repo/web/scripts/invite/Invite.java
index cd2094625d..a96054ed17 100644
--- a/source/java/org/alfresco/repo/web/scripts/invite/Invite.java
+++ b/source/java/org/alfresco/repo/web/scripts/invite/Invite.java
@@ -21,11 +21,13 @@ package org.alfresco.repo.web.scripts.invite;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.service.cmr.invitation.Invitation;
 import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
 import org.alfresco.service.cmr.invitation.InvitationExceptionUserError;
 import org.alfresco.service.cmr.invitation.InvitationService;
 import org.alfresco.service.cmr.invitation.NominatedInvitation;
+import org.alfresco.util.UrlUtil;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
@@ -68,12 +70,21 @@ public class Invite extends DeclarativeWebScript
     
     // services
     private InvitationService invitationService;
+    private SysAdminParams sysAdminParams;
     
     public void setInvitationService(InvitationService invitationService)
     {
         this.invitationService = invitationService;
     }
     
+    /**
+     * @param sysAdminParams the sysAdminParams to set
+     */
+    public void setSysAdminParams(SysAdminParams sysAdminParams)
+    {
+        this.sysAdminParams = sysAdminParams;
+    }
+    
     
     /*
      * (non-Javadoc)
@@ -214,6 +225,7 @@ public class Invite extends DeclarativeWebScript
                 }
                 else
                 {
+                    serverPath = UrlUtil.getShareUrl(sysAdminParams);
                     newInvite = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, serverPath, acceptUrl, rejectUrl);
                 }
                 // add model properties for template to render