inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-07 18:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
58206: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58147: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58037: MNT-9932: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57933: MNT-9932: Error Message while accessing cancelled workflow- task-edit link from mail notification
               - Add useful error messages for case when edit page is opened for cancelled task


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis 2014-02-11 23:01:43 +00:00
parent ba6f6c4b97
commit a2901da28e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java
View File

@ -107,7 +107,13 @@ public class TaskFormProcessor extends AbstractWorkflowFormProcessor<WorkflowTas
@Override @Override
protected WorkflowTask getTypedItemForDecodedId(String itemId) protected WorkflowTask getTypedItemForDecodedId(String itemId)
{ {
return workflowService.getTaskById(itemId); WorkflowTask task = workflowService.getTaskById(itemId);
if (task == null)
{
String msg = "Workflow task does not exist: " + itemId;
throw new IllegalArgumentException(msg);
}
return task;
} }
/** /**

6
source/test-java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java
View File

@ -57,7 +57,6 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowDefinition;
import org.alfresco.service.cmr.workflow.WorkflowException;
import org.alfresco.service.cmr.workflow.WorkflowInstance; import org.alfresco.service.cmr.workflow.WorkflowInstance;
import org.alfresco.service.cmr.workflow.WorkflowNode; import org.alfresco.service.cmr.workflow.WorkflowNode;
import org.alfresco.service.cmr.workflow.WorkflowPath; import org.alfresco.service.cmr.workflow.WorkflowPath;
@ -787,7 +786,10 @@ public class TaskFormProcessorTest extends TestCase
if (TASK_ID.equals(id)) if (TASK_ID.equals(id))
return task; return task;
else else
throw new WorkflowException("Task Id not found!"); {
// if TaskId is not found then Activity returns null, does not throws WorkflowException
return null;
}
} }
}); });