mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-15 15:02:20 +00:00
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
99482: Merged DEV to 5.0.N (5.0.1)
99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc typo in project alfresco-jlan
99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project alfresco-jlan
99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project core
99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project data-model
99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project file-transfer-receiver
99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project legacy-lucene
99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project qa-share
99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project remote-api
99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc in project Repository, letters S..Z
99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc in project Repository, letters A..R
99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project share-po
99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc typo in project slingshot
99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project slingshot
99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project solr
99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project solr4
99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project solr-client
99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project web-client
99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Changed Javadoc parameters inconsistence in project web-framework-commons
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
@@ -179,14 +179,13 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the invitation process for a NominatedInvitation
|
||||
*
|
||||
* @param inviteeUserName Alfresco user name of the invitee
|
||||
* @param Invitation
|
||||
* @param ResourceType resourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param serverPath
|
||||
* Start the invitation process for a NominatedInvitation
|
||||
*
|
||||
* @param inviteeUserName Alfresco user name of the invitee
|
||||
* @param resourceType resourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param serverPath
|
||||
* @param acceptUrl
|
||||
* @param rejectUrl
|
||||
* @return the nominated invitation which will contain the invitationId and
|
||||
@@ -213,14 +212,13 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
serverPath, acceptUrl, rejectUrl);
|
||||
}
|
||||
/**
|
||||
* Start the invitation process for a NominatedInvitation
|
||||
*
|
||||
* @param inviteeUserName Alfresco user name of the invitee
|
||||
* @param Invitation
|
||||
* @param ResourceType resourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param acceptUrl
|
||||
* Start the invitation process for a NominatedInvitation
|
||||
*
|
||||
* @param inviteeUserName Alfresco user name of the invitee
|
||||
* @param resourceType resourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param acceptUrl
|
||||
* @param rejectUrl
|
||||
* @return the nominated invitation which will contain the invitationId and
|
||||
* ticket which will uniqely identify this invitation for the rest
|
||||
@@ -249,15 +247,14 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
/**
|
||||
* Start the invitation process for a NominatedInvitation
|
||||
*
|
||||
* @param inviteeFirstName
|
||||
* @param inviteeLastName
|
||||
* @param inviteeEmail
|
||||
* @param inviteeUserName optional Alfresco user name of the invitee, null
|
||||
* if not on system.
|
||||
* @param Invitation .ResourceType resourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param acceptUrl
|
||||
* @param inviteeFirstName
|
||||
* @param inviteeLastName
|
||||
* @param inviteeEmail
|
||||
* @param inviteeEmail
|
||||
* @param resourceType Invitation.ResourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param acceptUrl
|
||||
* @param rejectUrl
|
||||
* @return the nominated invitation which will contain the invitationId and
|
||||
* ticket which will uniqely identify this invitation for the rest
|
||||
@@ -277,15 +274,13 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
/**
|
||||
* Start the invitation process for a NominatedInvitation
|
||||
*
|
||||
* @param inviteeFirstName
|
||||
* @param inviteeLastName
|
||||
* @param inviteeEmail
|
||||
* @param inviteeUserName optional Alfresco user name of the invitee, null
|
||||
* if not on system.
|
||||
* @param Invitation .ResourceType resourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param serverPath
|
||||
* @param inviteeFirstName
|
||||
* @param inviteeLastName
|
||||
* @param inviteeEmail
|
||||
* @param resourceType
|
||||
* @param resourceName
|
||||
* @param inviteeRole
|
||||
* @param serverPath
|
||||
* @param acceptUrl
|
||||
* @param rejectUrl
|
||||
* @return the nominated invitation which will contain the invitationId and
|
||||
@@ -321,15 +316,15 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
throw new InvitationException("unknown resource type");
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the invitation process for a ModeratedInvitation
|
||||
*
|
||||
* @param comments why does the invitee want access to the resource ?
|
||||
* @param inviteeUserName who is to be invited
|
||||
* @param Invitation .ResourceType resourceType what resource type ?
|
||||
* @param resourceName which resource
|
||||
* @param inviteeRole which role ?
|
||||
*/
|
||||
/**
|
||||
* Start the invitation process for a ModeratedInvitation
|
||||
*
|
||||
* @param inviteeComments why does the invitee want access to the resource ?
|
||||
* @param inviteeUserName who is to be invited
|
||||
* @param resourceType Invitation .ResourceType what resource type ?
|
||||
* @param resourceName which resource
|
||||
* @param inviteeRole which role ?
|
||||
*/
|
||||
public ModeratedInvitation inviteModerated(String inviteeComments, String inviteeUserName,
|
||||
Invitation.ResourceType resourceType, String resourceName, String inviteeRole)
|
||||
{
|
||||
@@ -400,13 +395,13 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Moderator approves this invitation
|
||||
*
|
||||
* @param request the request to approve
|
||||
* @param reason comments about the acceptance
|
||||
*/
|
||||
public Invitation approve(String invitationId, String reason)
|
||||
/**
|
||||
* Moderator approves this invitation
|
||||
*
|
||||
* @param invitationId the request id
|
||||
* @param reason comments about the acceptance
|
||||
*/
|
||||
public Invitation approve(String invitationId, String reason)
|
||||
{
|
||||
WorkflowTask startTask = getStartTask(invitationId);
|
||||
ModeratedInvitation invitation = getModeratedInvitation(invitationId);
|
||||
@@ -1225,20 +1220,22 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the Invite workflow
|
||||
*
|
||||
* @param inviteeFirstName first name of invitee
|
||||
* @param inviteeLastNamme last name of invitee
|
||||
* @param inviteeEmail email address of invitee
|
||||
* @param siteShortName short name of site that the invitee is being invited
|
||||
* to by the inviter
|
||||
* Starts the Invite workflow
|
||||
*
|
||||
* @param inviteeFirstName first name of invitee
|
||||
* @param inviteeLastName last name of invitee
|
||||
* @param inviteeEmail email address of invitee
|
||||
* @param siteShortName short name of site that the invitee is being invited
|
||||
* to by the inviter
|
||||
* @param inviteeSiteRole role under which invitee is being invited to the
|
||||
* site by the inviter
|
||||
* @param serverPath externally accessible server address of server hosting
|
||||
* invite web scripts
|
||||
*/
|
||||
private NominatedInvitation startNominatedInvite(String inviteeFirstName, String inviteeLastName,
|
||||
String inviteeEmail, String inviteeUserName, Invitation.ResourceType resourceType,
|
||||
* site by the inviter
|
||||
* @param serverPath externally accessible server address of server hosting
|
||||
* invite web scripts
|
||||
* @param acceptUrl accept Url
|
||||
* @param rejectUrl reject Url
|
||||
*/
|
||||
private NominatedInvitation startNominatedInvite(String inviteeFirstName, String inviteeLastName,
|
||||
String inviteeEmail, String inviteeUserName, Invitation.ResourceType resourceType,
|
||||
String siteShortName, String inviteeSiteRole, String serverPath, String acceptUrl, String rejectUrl)
|
||||
{
|
||||
|
||||
@@ -1535,13 +1532,13 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
||||
throw new IllegalStateException("None of the Workflow engines supported by teh InvitationService are currently enabled!");
|
||||
}
|
||||
|
||||
/**
|
||||
* Check that the specified user has manager role over the resource.
|
||||
*
|
||||
* @param userId
|
||||
* @throws InvitationException
|
||||
*/
|
||||
private void checkManagerRole(String userId, Invitation.ResourceType resourceType, String siteShortName)
|
||||
/**
|
||||
* Check that the specified user has manager role over the resource.
|
||||
*
|
||||
* @param userId user id
|
||||
* @throws InvitationException
|
||||
*/
|
||||
private void checkManagerRole(String userId, Invitation.ResourceType resourceType, String siteShortName)
|
||||
{
|
||||
// if inviter is not the site manager then throw web script exception
|
||||
String inviterRole = this.siteService.getMembersRole(siteShortName, userId);
|
||||
|
||||
Reference in New Issue
Block a user