You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2018/11/29 16:24:48 UTC

[syncope] branch 2_0_X updated: [SYNCOPE-1394] Fix old sorted query

This is an automated email from the ASF dual-hosted git repository.

skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_0_X by this push:
     new d0f48df  [SYNCOPE-1394] Fix old sorted query
d0f48df is described below

commit d0f48df73e2bfbcf32a65c0dd21a3ed288b1e584
Author: skylark17 <ma...@tirasa.net>
AuthorDate: Thu Nov 29 17:24:21 2018 +0100

    [SYNCOPE-1394] Fix old sorted query
---
 .../syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java   | 4 ++--
 .../syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 f85fdf6..0953276 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
@@ -674,8 +674,8 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
                     sortedQuery = sortedQuery.orderByTaskDueDate();
                     break;
 
-                case "owner":
-                    sortedQuery = sortedQuery.orderByTaskOwner();
+                case "assignee":
+                    sortedQuery = sortedQuery.orderByTaskAssignee();
                     break;
 
                 default:
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 d8d2221..872c816 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
@@ -673,8 +673,8 @@ public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
                     sortedQuery = sortedQuery.orderByTaskDueDate();
                     break;
 
-                case "owner":
-                    sortedQuery = sortedQuery.orderByTaskOwner();
+                case "assignee":
+                    sortedQuery = sortedQuery.orderByTaskAssignee();
                     break;
 
                 default: