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

FIXED : ALF-12036: External User Invitation issues

Browse Source 
Uses the serverPath from sysAdminParams instead of being passed in by webscripts

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2011-12-20 15:41:39 +00:00
parent e564eda697
commit 61b23f8e84
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/web/scripts/invite/Invite.java
View File

@@ -70,21 +70,12 @@ 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)
@@ -221,12 +212,11 @@ public class Invite extends DeclarativeWebScript
{
if (inviteeUserName != null)
{
newInvite = invitationService.inviteNominated(inviteeUserName, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, serverPath, acceptUrl, rejectUrl);
newInvite = invitationService.inviteNominated(inviteeUserName, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, acceptUrl, rejectUrl);
}
else
{
serverPath = UrlUtil.getShareUrl(sysAdminParams);
newInvite = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, serverPath, acceptUrl, rejectUrl);
newInvite = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, acceptUrl, rejectUrl);
}
// add model properties for template to render
model.put(MODEL_PROP_KEY_ACTION, ACTION_START);