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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-12253

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2013-07-09 13:36:04 -04:00
parent c372740a37 1568bed499
commit 23fe530778
8 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.case.php
View File

@@ -5950,7 +5950,7 @@ class Cases
//save data
$aData = array();
$aData['APP_NUMBER'] = $Fields['APP_NUMBER'];
$aData['APP_PROC_STATUS'] = $Fields['APP_PROC_STATUS'];
//$aData['APP_PROC_STATUS'] = $Fields['APP_PROC_STATUS'];
$aData['APP_DATA'] = $Fields['APP_DATA'];
$aData['DEL_INDEX'] = $iIndex;
$aData['TAS_UID'] = $sTask;
@@ -6544,6 +6544,10 @@ class Cases
$oPMScript->setScript($webBotTrigger);
$oPMScript->execute();
$aFields['APP_DATA'] = array_merge($aFields['APP_DATA'], $oPMScript->aFields);
unset($aFields['APP_STATUS']);
unset($aFields['APP_PROC_STATUS']);
unset($aFields['APP_PROC_CODE']);
unset($aFields['APP_PIN']);
$this->updateCase($aFields['APP_UID'], $aFields);
return true;
}

4
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2380,6 +2380,10 @@ function PMFRedirectToStep ($sApplicationUID, $iDelegation, $sStepType, $sStepUi
// save data
if (! is_null( $oPMScript )) {
$aFields['APP_DATA'] = $oPMScript->aFields;
unset($aFields['APP_STATUS']);
unset($aFields['APP_PROC_STATUS']);
unset($aFields['APP_PROC_CODE']);
unset($aFields['APP_PIN']);
$oCase->updateCase( $sApplicationUID, $aFields );
}

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

@@ -1813,6 +1813,10 @@ class wsBase
$arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "BEFORE", $arrayField["APP_DATA"]);
$arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "AFTER", $arrayField["APP_DATA"]);
unset($arrayField['APP_STATUS']);
unset($arrayField['APP_PROC_STATUS']);
unset($arrayField['APP_PROC_CODE']);
unset($arrayField['APP_PIN']);
$arrayField = $oCase->updateCase($caseId, $arrayField);
}
}
@@ -2067,6 +2071,10 @@ class wsBase
//$appFields = $oCase->loadCase( $caseId );
$appFields['APP_DATA'] = $oPMScript->aFields;
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
$oCase->updateCase( $caseId, $appFields );
}
}
@@ -2114,6 +2122,10 @@ class wsBase
$varTriggers .= "&nbsp;- " . nl2br( htmlentities( $oTrigger->getTriTitle(), ENT_QUOTES ) ) . "<br/>";
//$appFields = $oCase->loadCase( $caseId );
$appFields['APP_DATA'] = $oPMScript->aFields;
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
//$appFields['APP_DATA']['APPLICATION'] = $caseId;
$oCase->updateCase( $caseId, $appFields );
}
@@ -2240,6 +2252,10 @@ class wsBase
$appFields['APP_DATA'] = $oPMScript->aFields;
//$appFields['APP_DATA']['APPLICATION'] = $caseId;
//$appFields = $oCase->loadCase($caseId);
unset($aFields['APP_STATUS']);
unset($aFields['APP_PROC_STATUS']);
unset($aFields['APP_PROC_CODE']);
unset($aFields['APP_PIN']);
$oCase->updateCase( $caseId, $appFields );
}
}
@@ -2440,6 +2456,10 @@ class wsBase
//Save data - Start
$appFields['APP_DATA'] = $oPMScript->aFields;
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
//$appFields = $oCase->loadCase($caseId);
$oCase->updateCase( $caseId, $appFields );
//Save data - End