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

PR observations

Browse Source
This commit is contained in:
Paula Quispe
2017-04-17 11:17:08 -04:00
parent e722fa19db
commit c1d03bc932
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2170,7 +2170,7 @@ class wsBase
*/ */
function executeTriggerFromDerivate($appData, $tasUid, $stepType, $stepUidObj, $triggerType, $labelAssigment = '') function executeTriggerFromDerivate($appData, $tasUid, $stepType, $stepUidObj, $triggerType, $labelAssigment = '')
{ {
$varTriggers = "\n"; $varTriggers = "";
$oCase = new Cases(); $oCase = new Cases();
//Execute triggers before assignment //Execute triggers before assignment
@@ -2223,7 +2223,7 @@ class wsBase
/** /**
* Derivate Case moves the case to the next task in the process according to the routing rules * Derivate Case moves the case to the next task in the process according to the routing rules
* * This function is used from: action by email, web entry, PMFDerivateCase, Mobile
* @param string $userId * @param string $userId
* @param string $caseId * @param string $caseId
* @param string $delIndex * @param string $delIndex
@@ -2318,13 +2318,14 @@ class wsBase
$previousAppData = $oPMScript->aFields; $previousAppData = $oPMScript->aFields;
} }
$varTriggers = "\n";
//Execute triggers before assignment //Execute triggers before assignment
if ($bExecuteTriggersBeforeAssignment) { if ($bExecuteTriggersBeforeAssignment) {
$varTriggers = $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -1, 'BEFORE', "-= Before Assignment =-"); $varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -1, 'BEFORE', "-= Before Assignment =-");
} }
//Execute triggers before routing //Execute triggers before routing
$varTriggers = $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE', "-= Before Derivation =-"); $varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE', "-= Before Derivation =-");
$oDerivation = new Derivation(); $oDerivation = new Derivation();
if (!empty($tasks)) { if (!empty($tasks)) {
@@ -2414,7 +2415,7 @@ class wsBase
$appFields = $oCase->loadCase( $caseId ); $appFields = $oCase->loadCase( $caseId );
//Execute triggers after routing //Execute triggers after routing
$varTriggers = $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-"); $varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-");
$sFromName = ""; $sFromName = "";

1
workflow/engine/classes/model/AppDelay.php
View File

@@ -124,7 +124,6 @@ class AppDelay extends BaseAppDelay
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( AppDelayPeer::APP_UID ); $oCriteria->addSelectColumn( AppDelayPeer::APP_UID );
$oCriteria->addSelectColumn( AppDelayPeer::APP_DEL_INDEX ); $oCriteria->addSelectColumn( AppDelayPeer::APP_DEL_INDEX );
$oCriteria->add( AppDelayPeer::APP_TYPE, '' );
$oCriteria->add( AppDelayPeer::APP_UID, $appUid ); $oCriteria->add( AppDelayPeer::APP_UID, $appUid );
$oCriteria->add( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'PAUSE' )->addOr( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'CANCEL' ) ) ); $oCriteria->add( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'PAUSE' )->addOr( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'CANCEL' ) ) );
$oCriteria->addAscendingOrderByColumn( AppDelayPeer::APP_ENABLE_ACTION_DATE ); $oCriteria->addAscendingOrderByColumn( AppDelayPeer::APP_ENABLE_ACTION_DATE );