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

Addition of invitations root scope script object to search for invitations accross web sites + unit test + web script.

Browse Source 
Addition of group REST API - but there's nothing behind it so don't get excited!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-04-01 15:25:39 +00:00
parent 972dd9a4ba
commit 2593e1298c
3 changed files with 136 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
View File

@@ -563,19 +563,6 @@ public class InvitationServiceImpl implements InvitationService
List<Invitation> ret = new ArrayList<Invitation>();
// at least one of 'inviterUserName',
// 'inviteeUserName', 'siteShortName',
// URL request parameters has not been provided
if (!(criteria.getInvitee() != null
|| criteria.getResourceName() != null
|| criteria.getInviter() != null))
{
Object[] objs = {};
throw new InvitationExceptionUserError(
"search invitation: At least one of the following URL request parameters must be provided in URL "
+ "'invite', 'inviter', 'resourceName'", objs);
}
InvitationSearchCriteria.InvitationType toSearch = criteria.getInvitationType();
/**
@@ -584,42 +571,35 @@ public class InvitationServiceImpl implements InvitationService
if(toSearch == InvitationSearchCriteria.InvitationType.ALL || toSearch == InvitationSearchCriteria.InvitationType.NOMINATED)
{
// query for nominated workflow tasks by given parameters
// create workflow task query
WorkflowTaskQuery wfTaskQuery = new WorkflowTaskQuery();
// the invite URL request
// parameters
// - because this web script class will terminate with a web script
// exception if none of the required
// request parameters are provided, at least one of these query
// properties will be set
// at this point
// workflow query properties
HashMap<QName, Object> wfNominatedQueryProps = new HashMap<QName, Object>(10,
1.0f);
if (criteria.getInviter() != null) {
wfNominatedQueryProps
.put(
WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME,
criteria.getInviter());
}
if (criteria.getInvitee() != null) {
wfNominatedQueryProps
.put(
WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME,
criteria.getInvitee());
}
if (criteria.getResourceName() != null) {
if (criteria.getInviter() != null)
{
wfNominatedQueryProps.put(
WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME,
criteria.getResourceName());
WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME,
criteria.getInviter());
}
if (criteria.getInvitee() != null)
{
wfNominatedQueryProps.put(
WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME,
criteria.getInvitee());
}
if (criteria.getResourceType() != null)
{
wfNominatedQueryProps.put(
WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE,
criteria.getResourceType().toString());
}
if (criteria.getResourceName() != null)
{
wfNominatedQueryProps.put(
WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME,
criteria.getResourceName());
}
// set workflow task query parameters
wfTaskQuery.setProcessCustomProps(wfNominatedQueryProps);
@@ -715,14 +695,17 @@ public class InvitationServiceImpl implements InvitationService
WorkflowModelModeratedInvitation.WF_PROP_INVITEE_USER_NAME,
criteria.getInvitee());
}
if (criteria.getResourceType() != null)
{
wfQueryModeratedProps.put(
WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_TYPE,
criteria.getResourceType().toString());
}
if (criteria.getResourceName() != null)
{
wfQueryModeratedProps.put(
WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_NAME,
criteria.getResourceName());
wfQueryModeratedProps.put(
WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_TYPE,
criteria.getResourceType().toString());
}
// set workflow task query parameters