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

Merged 5.1.N (5.1.1) to HEAD (5.2)

Browse Source 
122427 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
         -added validation on backend to prevent multiple requests for joining a site
         -updated unit tests
         -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 22:25:47 +00:00
parent 259d5ebea7
commit 0c0dbb8d60
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2016 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -902,8 +902,21 @@ public class Site implements Serializable
*/ */
public ScriptInvitation<?> inviteModerated(String inviteeComments, String inviteeUserName, String inviteeRole) public ScriptInvitation<?> inviteModerated(String inviteeComments, String inviteeUserName, String inviteeRole)
{ {
Invitation invitation = invitationService.inviteModerated(inviteeComments, inviteeUserName, Invitation.ResourceType.WEB_SITE, getShortName(), inviteeRole); InvitationSearchCriteriaImpl crit = new InvitationSearchCriteriaImpl();
return scriptInvitationFactory.toScriptInvitation(invitation); crit.setResourceName(getShortName());
crit.setResourceType(Invitation.ResourceType.WEB_SITE);
crit.setInvitee(inviteeUserName);
List<Invitation> invitations = invitationService.searchInvitation(crit);
if(invitations.isEmpty())
{
Invitation invitation = invitationService.inviteModerated(inviteeComments, inviteeUserName, Invitation.ResourceType.WEB_SITE, getShortName(), inviteeRole);
return scriptInvitationFactory.toScriptInvitation(invitation);
}
else
{
throw new InvitationException("A request to join this site is in pending");
}
} }
/** /**