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 DEV to 5.2.N (5.2.1)

Browse Source 
131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alex Mukha
2016-10-10 17:34:57 +00:00
parent 245770e049
commit 33ee24817c
172 changed files with 320 additions and 14389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/service/cmr/workflow/WorkflowPermissionInterceptor.java
View File

@@ -195,7 +195,7 @@ public class WorkflowPermissionInterceptor implements MethodInterceptor
private boolean fromSameParallelReviewWorkflow(WorkflowTask wt, String userName)
{
// check whether this is parallel review workflow, "parallel" will match all jbpm and activity parallel workflows
// check whether this is parallel review workflow, "parallel" will match all parallel workflows (any engine)
if (wt.getPath().getInstance().getDefinition().getName().toLowerCase().contains("parallel"))
{
WorkflowTaskQuery tasksQuery = new WorkflowTaskQuery();

4
source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
View File

@@ -156,7 +156,7 @@ public interface WorkflowService
/**
* Gets the latest Workflow Definition by unique name
*
* @param workflowName workflow name e.g. jbpm$wf:review
* @param workflowName workflow name e.g. activiti$activitiReview
* @return the deployed workflow definition (or null if not found)
*/
@Auditable(parameters = {"workflowName"})
@@ -165,7 +165,7 @@ public interface WorkflowService
/**
* Gets all (including previous) Workflow Definitions for the given unique name
*
* @param workflowName workflow name e.g. jbpm$wf:review
* @param workflowName workflow name e.g. activiti$activitiReview
* @return the deployed workflow definition (or null if not found)
*/
@Auditable(parameters = {"workflowName"})