Merged in bugfix/HOR-3015 (pull request #5606)

HOR-3015

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2017-04-11 18:08:01 +00:00

View File

@@ -2183,6 +2183,8 @@ class wsBase
$varResponse = ''; $varResponse = '';
$varTriggers = "\n"; $varTriggers = "\n";
$previousAppData = array();
if ($delIndex == '') { if ($delIndex == '') {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX ); $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX );
@@ -2258,6 +2260,10 @@ class wsBase
global $oPMScript; global $oPMScript;
if (isset($oPMScript->aFields['APPLICATION']) && ($oPMScript->aFields['APPLICATION'] != $caseId)) {
$previousAppData = $oPMScript->aFields;
}
if ($bExecuteTriggersBeforeAssignment) { if ($bExecuteTriggersBeforeAssignment) {
//Execute triggers before assignment //Execute triggers before assignment
$aTriggers = $oCase->loadTriggers( $appdel['TAS_UID'], 'ASSIGN_TASK', - 1, 'BEFORE' ); $aTriggers = $oCase->loadTriggers( $appdel['TAS_UID'], 'ASSIGN_TASK', - 1, 'BEFORE' );
@@ -2592,6 +2598,10 @@ class wsBase
$g->sessionVarRestore(); $g->sessionVarRestore();
if (!empty($previousAppData)) {
$oPMScript->aFields = $previousAppData;
}
return $res; return $res;
} catch (Exception $e) { } catch (Exception $e) {
$result = new wsResponse( 100, $e->getMessage() ); $result = new wsResponse( 100, $e->getMessage() );