Fixed failing InviteServiceTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/workflow/invitation-moderated-workflow-model.xml

@@ -40,14 +40,14 @@
             <properties>
                 <property name="imwf:reviewOutcome">
                     <type>d:text</type>
-                    <default>Reject</default>
+                    <default>reject</default>
                     <constraints>
                         <constraint name="imwf:reviewOutcomeOptions"
                             type="LIST">
                             <parameter name="allowedValues">
                                 <list>
-                                    <value>Approve</value>
+                                    <value>approve</value>
-                                    <value>Reject</value>
+                                    <value>reject</value>
                                 </list>
                             </parameter>
                         </constraint>

config/alfresco/workflow/invitation-nominated-workflow-model.xml

@@ -62,7 +62,7 @@
         <properties>
             <property name="inwf:inviteOutcome">
                 <type>d:text</type>
-                <default>Reject</default>
+                <default>reject</default>
                 <constraints>
                     <constraint name="inwf:inviteOutcomeOptions"
                         type="LIST">

source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java

@@ -38,7 +38,6 @@ import org.alfresco.repo.security.authentication.PasswordGenerator;
 import org.alfresco.repo.security.authentication.UserNameGenerator;
 import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.workflow.WorkflowModel;
-import org.alfresco.repo.workflow.activiti.ActivitiConstants;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.invitation.Invitation;
 import org.alfresco.service.cmr.invitation.InvitationException;
@@ -414,6 +413,11 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
     private Invitation cancelNominatedInvitation(WorkflowTask startTask)
     {
         NominatedInvitation invitation = getNominatedInvitation(startTask);
+        String currentUserName = this.authenticationService.getCurrentUserName();
+        if (false == currentUserName.equals(invitation.getInviterUserName()))
+        {
+            checkManagerRole(currentUserName, invitation.getResourceType(), invitation.getResourceName());
+        }
         endInvitation(startTask, 
                 WorkflowModelNominatedInvitation.WF_TRANSITION_CANCEL, null,
                 WorkflowModelNominatedInvitation.WF_TASK_INVITE_PENDING, WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING);

source/java/org/alfresco/repo/invitation/InviteHelper.java

@@ -18,6 +18,8 @@
  */
 package org.alfresco.repo.invitation;
 
+import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING;
+import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.WF_TASK_INVITE_PENDING;
 import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarAcceptUrl;
 import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarInviteTicket;
 import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarInviteeGenPassword;
@@ -28,8 +30,6 @@ import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVa
 import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarRole;
 import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarServerPath;
 import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarWorkflowInstanceId;
-import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.WF_TASK_INVITE_PENDING;
-import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -63,7 +63,6 @@ import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.cmr.workflow.WorkflowTask;
-import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
 import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
@@ -291,46 +290,6 @@ public class InviteHelper implements InitializingBean
         }, AuthenticationUtil.getSystemUserName());
     }
     
-    /**
-     * Complete the specified Invite Workflow Task for the invite workflow 
-     * instance associated with the given invite ID, and follow the given
-     * transition upon completing the task
-     * 
-     * @param inviteId the invite ID of the invite workflow instance for which
-     *          we want to complete the given task
-     * @param fullTaskName qualified name of invite workflow task to complete
-     * @param transitionId the task transition to take on completion of 
-     *          the task (or null, for the default transition)
-     * @param workflowService TODO
-     */
-    public static void completeInviteTask(String inviteId, QName fullTaskName, String transitionId, WorkflowService workflowService)
-    {
-        // create workflow task query
-        WorkflowTaskQuery wfTaskQuery = new WorkflowTaskQuery();
-        
-        // set the given invite ID as the workflow process ID in the workflow query
-        wfTaskQuery.setProcessId(inviteId);
-
-        // find incomplete invite workflow tasks with given task name 
-        wfTaskQuery.setActive(Boolean.TRUE);
-        wfTaskQuery.setTaskState(WorkflowTaskState.IN_PROGRESS);
-        wfTaskQuery.setTaskName(fullTaskName);
-
-        // set process name to "wf:invite" so that only
-        // invite workflow instances are considered by this query
-        wfTaskQuery.setProcessName(WorkflowModelNominatedInvitation.WF_PROCESS_INVITE);
-
-        // query for invite workflow tasks with the constructed query
-        List<WorkflowTask> wf_invite_tasks = workflowService
-                .queryTasks(wfTaskQuery);
-        
-        // end all tasks found with this name 
-        for (WorkflowTask workflowTask : wf_invite_tasks)
-        {
-            workflowService.endTask(workflowTask.getId(), transitionId);
-        }
-    }
-    
     /**
      * @param executionVariables
      */