inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

SHA-1779 : Double slash in the pending invites link

Browse Source 
- 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
This commit is contained in:
Constantin Popa
2016-09-23 12:22:28 +00:00
parent 9aee167afc
commit c4484c18e3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java
View File

@@ -106,11 +106,16 @@ public class InviteModeratedSender extends InviteSender
PersonInfo inviteePerson = personService.getPerson(invitee); PersonInfo inviteePerson = personService.getPerson(invitee);
model.put("inviteeName", StringUtils.join(new String[] { inviteePerson.getFirstName(), inviteePerson.getLastName() }, " ")); model.put("inviteeName", StringUtils.join(new String[] { inviteePerson.getFirstName(), inviteePerson.getLastName() }, " "));
model.put("siteName", getSiteName(properties)); model.put("siteName", getSiteName(properties));
model.put("sharePendingInvitesLink", MessageFormat.format(SHARE_PENDING_INVITES_LINK, TenantUtil.getCurrentDomain(), model.put("sharePendingInvitesLink", StringUtils.stripStart(getPendingInvitesLink(properties), "/"));
properties.get(WorkflowModelModeratedInvitation.wfVarResourceName)));
return model; return model;
} }
protected String getPendingInvitesLink(Map<String, String> properties)
{
return MessageFormat.format(SHARE_PENDING_INVITES_LINK, TenantUtil.getCurrentDomain(),
properties.get(WorkflowModelModeratedInvitation.wfVarResourceName));
}
@Override @Override
public List<String> getRequiredProperties() public List<String> getRequiredProperties()
{ {

4
source/test-java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
View File

@@ -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.SiteInfo;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.apache.commons.lang.StringUtils;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@@ -90,7 +91,6 @@ public class InviteModeratedSenderTest extends TestCase
private static final String shortSiteName = "site-name"; private static final String shortSiteName = "site-name";
private static final String packageId = testStore + "/Package"; 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); private final MessageService messageService = mock(MessageService.class);
@@ -117,6 +117,8 @@ public class InviteModeratedSenderTest extends TestCase
ArgumentCaptor<Map> modelC = ArgumentCaptor.forClass(Map.class); ArgumentCaptor<Map> modelC = ArgumentCaptor.forClass(Map.class);
verify(mailAction).setParameterValue(eq(MailActionExecuter.PARAM_TEMPLATE_MODEL), (Serializable)modelC.capture()); 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 // Check the model
Map model = modelC.getValue(); Map model = modelC.getValue();
assertNotNull(model); assertNotNull(model);