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

BUG-14822 New column in Steps > Triggers that shows Condition.

Browse Source 
A new column was added in Steps > Triggers to show if the actual trigger has or not a Condition.
This commit is contained in:
jennylee
2014-09-17 15:33:51 -04:00
parent 89d54f6f9c
commit 2245ce9906
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.processMap.php
View File

@@ -889,6 +889,8 @@ class processMap
public function getStepTriggersCriteria($sStepUID = '', $sTaskUID = '', $sType = '')
{
$imgEx = "<div><img src='/images/hasCondition.png' height='16' width='16'></div>";
$imgNoEx = '<div></div>';
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn('C.CON_VALUE');
@@ -896,6 +898,7 @@ class processMap
$oCriteria->addSelectColumn('TRI_UID');
$oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', '(SELECT LOCATE(MD5(' . TriggersPeer::TRI_WEBBOT . '),' . TriggersPeer::TRI_PARAM . ') FROM ' . TriggersPeer::TABLE_NAME . ' WHERE ' . TriggersPeer::TRI_UID . '=' . StepTriggerPeer::TRI_UID . ' )');
$oCriteria->addSelectColumn('ST_TYPE');
$oCriteria->addSelectColumn('IF ('.StepTriggerPeer::ST_CONDITION.' = "", "'.$imgNoEx.'", "'.$imgEx.'") AS CONDITION_SET');
$oCriteria->addSelectColumn(StepTriggerPeer::ST_POSITION);
$oCriteria->addAsColumn('TRI_TITLE', 'C.CON_VALUE');
$oCriteria->addAlias('C', 'CONTENT');