Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)

106196: SHA-993: Create Site Link in Email
     - Modified InviteSender to add siteDashboardLink as a property being sent to the email generation
     - Updated email template with siteDashboardLink
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ray Gauss
2015-08-25 14:02:29 +00:00
parent dd308bc12f
commit d04367fc9c
3 changed files with 31 additions and 2 deletions

View File

@@ -96,6 +96,7 @@ public class InviteSenderTest extends TestCase
private static final String acceptUrl = "/accpet";
private static final String rejectUrl = "/reject";
private static final String dashboardUrl = "/dashboard";
private static final String role = "Role";
private static final String password = "password";
private static final String ticket = "Ticket";
@@ -170,6 +171,12 @@ public class InviteSenderTest extends TestCase
"test://test/path/reject?inviteId=InstanceId&inviteeUserName=invitee&siteShortName=Full Site Name&inviteTicket=Ticket",
argsMap.get("rejectLink"));
}
else
{
assertEquals(
"test://test/path/page/site/Full Site Name" + dashboardUrl,
argsMap.get("siteDashboardLink"));
}
// When no role message is found then the role name is used.