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

1
workflow/engine/xmlform/steps/triggersAfter_List.xml
View File

@@ -10,6 +10,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID,@QTRI_LOCATE_WEBBOT_PARAM); return false;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, 'AFTER');return false;"/>
<CONDITION_SET type="text" enablehtml="1" align="left" colWidth=""/>
<UP type="link" colWidth="" value="@G::LoadTranslation(ID_UP)" link="#" onclick="upTrigger(@QSTEP_UID, @QTRI_UID, 'AFTER', @QST_POSITION);return false;"/>
<DOWN type="link" colWidth="" value="@G::LoadTranslation(ID_DOWN)" link="#" onclick="downTrigger(@QSTEP_UID, @QTRI_UID, 'AFTER', @QST_POSITION);return false;"/>
<DELETE type="link" colWidth="" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="ofToAssignTrigger(@QSTEP_UID, @QTRI_UID, 'AFTER', @QST_POSITION);return false;">

1
workflow/engine/xmlform/steps/triggersBefore_List.xml
View File

@@ -10,6 +10,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID,@QTRI_LOCATE_WEBBOT_PARAM); return false;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, 'BEFORE');return false;"/>
<CONDITION_SET type="text" enablehtml="1" align="left" colWidth=""/>
<UP type="link" colWidth="" value="@G::LoadTranslation(ID_UP)" link="#" onclick="upTrigger(@QSTEP_UID, @QTRI_UID, 'BEFORE', @QST_POSITION);return false;"/>
<DOWN type="link" colWidth="" value="@G::LoadTranslation(ID_DOWN)" link="#" onclick="downTrigger(@QSTEP_UID, @QTRI_UID, 'BEFORE', @QST_POSITION);return false;"/>
<DELETE type="link" colWidth="" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="ofToAssignTrigger(@QSTEP_UID, @QTRI_UID, 'BEFORE', @QST_POSITION);return false;">

3
workflow/engine/xmlform/steps/triggersCondition_Edit.xml
View File

@@ -68,7 +68,10 @@ var insertFormVar = function(sFieldName, sValue) {
function saveTriggerCondition(oForm)
{
ajax_post(oForm.action, oForm, 'POST');
var sStep = document.getElementById('form[STEP_UID]').value;
var sType = document.getElementById('form[ST_TYPE]').value;
currentPopupWindow.remove();
showTriggers('@#STEP_UID', sType);
}
]]></JS>