From c4484c18e32c430bb7ea659a42f2b0c0d594a7aa Mon Sep 17 00:00:00 2001
From: Constantin Popa <Constantin.popa@ness.com>
Date: Fri, 23 Sep 2016 12:22:28 +0000
Subject: [PATCH] SHA-1779 : Double slash in the pending invites link    - Get
 rid of the double slash in the pending invites link

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/invitation/site/InviteModeratedSender.java      | 9 +++++++--
 .../repo/invitation/site/InviteModeratedSenderTest.java  | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java b/source/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java
index 5f2543b54b..6a1f20cbe2 100644
--- a/source/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java
+++ b/source/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java
@@ -106,11 +106,16 @@ public class InviteModeratedSender extends InviteSender
         PersonInfo inviteePerson = personService.getPerson(invitee);
         model.put("inviteeName", StringUtils.join(new String[] { inviteePerson.getFirstName(), inviteePerson.getLastName() }, " "));
         model.put("siteName", getSiteName(properties));
-        model.put("sharePendingInvitesLink", MessageFormat.format(SHARE_PENDING_INVITES_LINK, TenantUtil.getCurrentDomain(),
-                                                                                              properties.get(WorkflowModelModeratedInvitation.wfVarResourceName)));
+        model.put("sharePendingInvitesLink", StringUtils.stripStart(getPendingInvitesLink(properties), "/"));
         return model;
     }
 
+    protected String getPendingInvitesLink(Map<String, String> properties)
+    {
+        return MessageFormat.format(SHARE_PENDING_INVITES_LINK, TenantUtil.getCurrentDomain(),
+                                    properties.get(WorkflowModelModeratedInvitation.wfVarResourceName));
+    }
+
     @Override
     public List<String> getRequiredProperties()
     {
diff --git a/source/test-java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java b/source/test-java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
index 46c6702a96..47df58af26 100644
--- a/source/test-java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
+++ b/source/test-java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
@@ -64,6 +64,7 @@ import org.alfresco.service.cmr.security.PersonService.PersonInfo;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
+import org.apache.commons.lang.StringUtils;
 import org.mockito.ArgumentCaptor;
 
 
@@ -90,7 +91,6 @@ public class InviteModeratedSenderTest extends TestCase
     private static final String shortSiteName = "site-name";
 
     private static final String packageId = testStore + "/Package";
-    private static final String pendingInvitesLink = MessageFormat.format("/page/site/{0}/pending-invites", shortSiteName);
     
     private final MessageService messageService = mock(MessageService.class);
 
@@ -116,6 +116,8 @@ public class InviteModeratedSenderTest extends TestCase
 
         ArgumentCaptor<Map> modelC = ArgumentCaptor.forClass(Map.class);
         verify(mailAction).setParameterValue(eq(MailActionExecuter.PARAM_TEMPLATE_MODEL), (Serializable)modelC.capture());
+
+        String pendingInvitesLink = StringUtils.stripStart(MessageFormat.format(InviteModeratedSender.SHARE_PENDING_INVITES_LINK, StringUtils.EMPTY, shortSiteName), "/");
         
         // Check the model
         Map model = modelC.getValue();