From 1e8aeda475481c26a38be30a16700cf4b51dbf86 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Fri, 14 Jul 2017 11:57:21 -0400
Subject: [PATCH] HOR-3516

---
 workflow/engine/classes/model/ListInbox.php        |  1 +
 .../engine/classes/model/ListParticipatedLast.php  |  1 +
 workflow/engine/classes/model/ListPaused.php       |  1 +
 workflow/engine/classes/model/ListUnassigned.php   |  1 +
 .../src/ProcessMaker/BusinessModel/Cases.php       | 14 ++++++++------
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index cc2368644..619bebe1b 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -555,6 +555,7 @@ class ListInbox extends BaseListInbox
             __CLASS__ . 'Peer',
             BasePeer::TYPE_FIELDNAME,
             empty($filters['sort']) ? "APP_UPDATE_DATE" : $filters['sort'],
+            "APP_UPDATE_DATE",
             $this->additionalClassName,
             $additionalColumns
         );
diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php
index 07466f40d..ce7321e43 100644
--- a/workflow/engine/classes/model/ListParticipatedLast.php
+++ b/workflow/engine/classes/model/ListParticipatedLast.php
@@ -370,6 +370,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
             __CLASS__ . 'Peer',
             BasePeer::TYPE_FIELDNAME,
             empty($filters['sort']) ? "DEL_DELEGATE_DATE" : $filters['sort'],
+            "DEL_DELEGATE_DATE",
             $this->additionalClassName,
             $additionalColumns
         );
diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php
index 749205493..1b885020d 100644
--- a/workflow/engine/classes/model/ListPaused.php
+++ b/workflow/engine/classes/model/ListPaused.php
@@ -313,6 +313,7 @@ class ListPaused extends BaseListPaused
             __CLASS__ . 'Peer',
             BasePeer::TYPE_FIELDNAME,
             empty($filters['sort']) ? "APP_PAUSED_DATE" : $filters['sort'],
+            "APP_PAUSED_DATE",
             $this->additionalClassName,
             $additionalColumns
         );
diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php
index 4cde1afce..26cf113eb 100644
--- a/workflow/engine/classes/model/ListUnassigned.php
+++ b/workflow/engine/classes/model/ListUnassigned.php
@@ -308,6 +308,7 @@ class ListUnassigned extends BaseListUnassigned
             __CLASS__ . 'Peer',
             BasePeer::TYPE_FIELDNAME,
             empty($filters['sort']) ? "DEL_DELEGATE_DATE" : $filters['sort'],
+            "DEL_DELEGATE_DATE",
             $this->additionalClassName,
             $additionalColumns
         );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 4813caced..25194fd82 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -3337,13 +3337,14 @@ class Cases
      * @param string $listPeer, name of the list class
      * @param string $field, name of the fieldName
      * @param string $sort, name of column by sort
+     * @param string $defaultSort, name of column by sort default
      * @param string $additionalClassName, name of the className of pmTable
      * @param array $additionalColumns, columns related to the custom cases list
      * @return string $tableName
      */
-    public function getSortColumn($listPeer, $field, $sort, $additionalClassName = '', $additionalColumns = array())
+    public function getSortColumn($listPeer, $field, $sort, $defaultSort, $additionalClassName = '', $additionalColumns = array())
     {
-        $columnSort = $sort;
+        $columnSort = $defaultSort;
 
         //We will check if the column by sort is a LIST table
         $columnsList = $listPeer::getFieldNames($field);
@@ -3351,16 +3352,17 @@ class Cases
             $columnSort  = $listPeer::TABLE_NAME . '.' . $sort;
         } else {
             //We will sort by CUSTOM CASE LIST table
-            if (count($additionalColumns) > 0) {
+            if (in_array($sort, $additionalColumns)) {
                 require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $additionalClassName . '.php');
                 $aTable = explode('.', current($additionalColumns));
                 if (count($aTable) > 0) {
                     $tableName = $aTable[0];
                 }
+                if (!empty($tableName)) {
+                    $columnSort = $tableName . '.' . $sort;
+                }
             }
-            if (!empty($tableName)) {
-                $columnSort = $tableName . '.' . $sort;
-            }
+
         }
 
         return $columnSort;