inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +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 3d13f43826
commit 4096c01153
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
View File

@@ -527,7 +527,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
String acceptUrl = "froob";
String rejectUrl = "marshmallow";
String expectedUserName = (inviteeFirstName + "_" + inviteeLastName).toLowerCase();
expectedUserName = expectedUserName.replaceAll("\\s+", "_");
authenticationComponent.setCurrentUser(USER_MANAGER);
NominatedInvitation nominatedInvitation = invitationService.inviteNominated(inviteeFirstName, inviteeLastName,

2
source/java/org/alfresco/repo/site/script/Site.java
View File

@@ -51,6 +51,7 @@ import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.UrlUtil;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import org.springframework.extensions.surf.util.ParameterCheck;
@@ -734,6 +735,7 @@ public class Site implements Serializable
*/
public ScriptInvitation<?> inviteNominated(String inviteeFirstName, String inviteeLastName, String inviteeEmail, String inviteeRole, String serverPath, String acceptUrl, String rejectUrl)
{
serverPath = UrlUtil.getShareUrl(serviceRegistry.getSysAdminParams());
Invitation invitation = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, getShortName(), inviteeRole, serverPath, acceptUrl, rejectUrl);
return scriptInvitationFactory.toScriptInvitation(invitation);
}