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();