You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/10/25 08:12:31 UTC
syncope git commit: Activiti / Flowable fix: lookup candidate user
for forms by username - according to SyncopeGroupQueryImpl's behavior
Repository: syncope
Updated Branches:
refs/heads/2_0_X f6d4d5d00 -> 7915c896f
Activiti / Flowable fix: lookup candidate user for forms by username - according to SyncopeGroupQueryImpl's behavior
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7915c896
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7915c896
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7915c896
Branch: refs/heads/2_0_X
Commit: 7915c896f7c0b922714fda4eb47bc5b4042997be
Parents: f6d4d5d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Oct 25 10:12:25 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Oct 25 10:12:25 2018 +0200
----------------------------------------------------------------------
.../core/workflow/activiti/ActivitiUserWorkflowAdapter.java | 2 +-
.../core/workflow/flowable/FlowableUserWorkflowAdapter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7915c896/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
index a919107..01647c5 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
@@ -631,7 +631,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
forms = getForms(engine.getTaskService().createTaskQuery().
taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE).
- taskCandidateOrAssigned(user.getKey()), page, size, orderByClauses);
+ taskCandidateOrAssigned(user.getUsername()), page, size, orderByClauses);
List<String> candidateGroups = new ArrayList<>();
for (String groupName : userDAO.findAllGroupNames(user)) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7915c896/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
index cb7d406..91f1fc6 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
@@ -630,7 +630,7 @@ public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
forms = getForms(engine.getTaskService().createTaskQuery().
taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE).
- taskCandidateOrAssigned(user.getKey()), page, size, orderByClauses);
+ taskCandidateOrAssigned(user.getUsername()), page, size, orderByClauses);
List<String> candidateGroups = new ArrayList<>();
for (String groupName : userDAO.findAllGroupNames(user)) {