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

Merged in paulis/processmaker/HOR-2114 (pull request #5231)

Browse Source 
HOR-2114
This commit is contained in:
Paula Quispe
2016-12-06 21:42:04 +00:00
parent f5ea1614e7 4ed5f2ddd2
commit 829cd9ddc1
50 changed files with 1648 additions and 1659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/class.wsBase.php
View File

@@ -630,24 +630,11 @@ class wsBase
public function triggerList ()
{
try {
$del = DBAdapter::getStringDelimiter();
$result = array ();
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( TriggersPeer::TRI_UID );
$oCriteria->addSelectColumn( TriggersPeer::PRO_UID );
$oCriteria->addAsColumn( 'TITLE', 'C1.CON_VALUE' );
$oCriteria->addAlias( "C1", 'CONTENT' );
$caseTitleConds = array ();
$caseTitleConds[] = array (TriggersPeer::TRI_UID,'C1.CON_ID'
);
$caseTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TRI_TITLE' . $del
);
$caseTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $caseTitleConds, Criteria::LEFT_JOIN );
//$oCriteria->add(TriggersPeer::USR_STATUS, 'ACTIVE');
$oCriteria->addAsColumn( 'TITLE', TriggersPeer::TRI_TITLE );
$oDataset = TriggersPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();