fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in qronald/processmaker/HOR-1329 (pull request #4447)

Browse Source 
HOR-1329
This commit is contained in:
Julio Cesar Laura Avendaño
2016-06-23 10:26:10 -04:00
parent 210fc4cf7b c6e803c6f0
commit 4dfbb5d931
18 changed files with 393 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.processes.php
View File

@@ -5930,13 +5930,7 @@ class Processes
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->addAsColumn("PRO_TITLE", ContentPeer::CON_VALUE);
$arrayCondition = array();
$arrayCondition[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID, Criteria::EQUAL);
$arrayCondition[] = array(ContentPeer::CON_CATEGORY, $delimiter . "PRO_TITLE" . $delimiter, Criteria::EQUAL);
$arrayCondition[] = array(ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
if ($processUid != "") {
$criteria->add(ProcessPeer::PRO_UID, $processUid, Criteria::EQUAL);