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

ALF-9315 Invitation accept/reject URLs were being created on the client but are now correctly created on the server.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-11-30 17:08:52 +00:00
parent ea996ad6ff
commit 591adda252
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/web-scripts-application-context.xml
View File

@@ -666,6 +666,7 @@
class="org.alfresco.repo.web.scripts.invite.Invite" class="org.alfresco.repo.web.scripts.invite.Invite"
parent="webscript"> parent="webscript">
<property name="invitationService" ref="InvitationService"/> <property name="invitationService" ref="InvitationService"/>
<property name="sysAdminParams" ref="sysAdminParams"/>
</bean> </bean>
<!-- --> <!-- -->

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

@@ -21,11 +21,13 @@ package org.alfresco.repo.web.scripts.invite;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.admin.SysAdminParams;
import org.alfresco.service.cmr.invitation.Invitation; import org.alfresco.service.cmr.invitation.Invitation;
import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden; import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
import org.alfresco.service.cmr.invitation.InvitationExceptionUserError; import org.alfresco.service.cmr.invitation.InvitationExceptionUserError;
import org.alfresco.service.cmr.invitation.InvitationService; import org.alfresco.service.cmr.invitation.InvitationService;
import org.alfresco.service.cmr.invitation.NominatedInvitation; import org.alfresco.service.cmr.invitation.NominatedInvitation;
import org.alfresco.util.UrlUtil;
import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
@@ -68,12 +70,21 @@ public class Invite extends DeclarativeWebScript
// services // services
private InvitationService invitationService; private InvitationService invitationService;
private SysAdminParams sysAdminParams;
public void setInvitationService(InvitationService invitationService) public void setInvitationService(InvitationService invitationService)
{ {
this.invitationService = invitationService; this.invitationService = invitationService;
} }
/**
* @param sysAdminParams the sysAdminParams to set
*/
public void setSysAdminParams(SysAdminParams sysAdminParams)
{
this.sysAdminParams = sysAdminParams;
}
/* /*
* (non-Javadoc) * (non-Javadoc)
@@ -214,6 +225,7 @@ public class Invite extends DeclarativeWebScript
} }
else 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, serverPath, acceptUrl, rejectUrl);
} }
// add model properties for template to render // add model properties for template to render