From 0ab5df8f6810a9fb7fb007574d254dc6a74179f1 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 30 Nov 2012 11:58:00 -0400 Subject: [PATCH 1/2] BUG 10127 Eventos: No existe orden en el listado de tareas SOLVED - Missing sor by clause in the criteria - Added sort by clause to the criteria --- workflow/engine/classes/class.processMap.php | 2 +- workflow/engine/classes/class.tasks.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 35dd9ba6d..d66365170 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -4882,7 +4882,7 @@ class processMap */ public function getEventsCriteria ($sProcessUID, $EVN_ACTION) { - try { + try {require_once 'classes/model/Event.php'; $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( EventPeer::EVN_UID ); diff --git a/workflow/engine/classes/class.tasks.php b/workflow/engine/classes/class.tasks.php index fbb2eda83..b451e6445 100755 --- a/workflow/engine/classes/class.tasks.php +++ b/workflow/engine/classes/class.tasks.php @@ -88,8 +88,18 @@ class Tasks { try { $aTasks = array (); + $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria( 'workflow' ); $oCriteria->add( TaskPeer::PRO_UID, $sProUid ); + $aConditions = array (); + $aConditions[] = array (TaskPeer::TAS_UID,ContentPeer::CON_ID + ); + $aConditions[] = array (ContentPeer::CON_CATEGORY,$sDelimiter . 'TAS_TITLE' . $sDelimiter + ); + $aConditions[] = array (ContentPeer::CON_LANG,$sDelimiter . SYS_LANG . $sDelimiter + ); + $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); + $oCriteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE ); $oDataset = TaskPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->next(); From 1dc2304efae0b32858110159606bd8ca898d3234 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 30 Nov 2012 12:02:19 -0400 Subject: [PATCH 2/2] BUG 10127 Eventos: No existe orden en el listado de tareas IMPROVEMENT --- workflow/engine/classes/class.processMap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index d66365170..35dd9ba6d 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -4882,7 +4882,7 @@ class processMap */ public function getEventsCriteria ($sProcessUID, $EVN_ACTION) { - try {require_once 'classes/model/Event.php'; + try { $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( EventPeer::EVN_UID );