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-12112

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-07-09 10:01:32 -04:00
parent af34ed842b 1568bed499
commit be4aef8fbd
8 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/bin/cron_single.php
View File

@@ -839,6 +839,10 @@ function executeCaseSelfService()
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], $oPMScript->aFields); $appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], $oPMScript->aFields);
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
$case->updateCase($appFields["APP_UID"], $appFields); $case->updateCase($appFields["APP_UID"], $appFields);
saveLog("unassignedCase", "action", "OK Executed tigger to the case $appcacheAppNumber"); saveLog("unassignedCase", "action", "OK Executed tigger to the case $appcacheAppNumber");

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

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

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

@@ -2380,6 +2380,10 @@ function PMFRedirectToStep ($sApplicationUID, $iDelegation, $sStepType, $sStepUi
// save data // save data
if (! is_null( $oPMScript )) { if (! is_null( $oPMScript )) {
$aFields['APP_DATA'] = $oPMScript->aFields; $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 ); $oCase->updateCase( $sApplicationUID, $aFields );
} }

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

@@ -1814,6 +1814,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"], "BEFORE", $arrayField["APP_DATA"]);
$arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "AFTER", $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); $arrayField = $oCase->updateCase($caseId, $arrayField);
} }
} }
@@ -2068,6 +2072,10 @@ class wsBase
//$appFields = $oCase->loadCase( $caseId ); //$appFields = $oCase->loadCase( $caseId );
$appFields['APP_DATA'] = $oPMScript->aFields; $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 ); $oCase->updateCase( $caseId, $appFields );
} }
} }
@@ -2115,6 +2123,10 @@ class wsBase
$varTriggers .= "&nbsp;- " . nl2br( htmlentities( $oTrigger->getTriTitle(), ENT_QUOTES ) ) . "<br/>"; $varTriggers .= "&nbsp;- " . nl2br( htmlentities( $oTrigger->getTriTitle(), ENT_QUOTES ) ) . "<br/>";
//$appFields = $oCase->loadCase( $caseId ); //$appFields = $oCase->loadCase( $caseId );
$appFields['APP_DATA'] = $oPMScript->aFields; $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; //$appFields['APP_DATA']['APPLICATION'] = $caseId;
$oCase->updateCase( $caseId, $appFields ); $oCase->updateCase( $caseId, $appFields );
} }
@@ -2241,6 +2253,10 @@ class wsBase
$appFields['APP_DATA'] = $oPMScript->aFields; $appFields['APP_DATA'] = $oPMScript->aFields;
//$appFields['APP_DATA']['APPLICATION'] = $caseId; //$appFields['APP_DATA']['APPLICATION'] = $caseId;
//$appFields = $oCase->loadCase($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 ); $oCase->updateCase( $caseId, $appFields );
} }
} }
@@ -2441,6 +2457,10 @@ class wsBase
//Save data - Start //Save data - Start
$appFields['APP_DATA'] = $oPMScript->aFields; $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); //$appFields = $oCase->loadCase($caseId);
$oCase->updateCase( $caseId, $appFields ); $oCase->updateCase( $caseId, $appFields );
//Save data - End //Save data - End

8
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -78,6 +78,10 @@ try {
$appFields['DEL_INDEX'] = $_SESSION['INDEX']; $appFields['DEL_INDEX'] = $_SESSION['INDEX'];
$appFields['TAS_UID'] = $_SESSION['TASK']; $appFields['TAS_UID'] = $_SESSION['TASK'];
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
$oCase->updateCase( $_SESSION['APPLICATION'], $appFields ); //Save data $oCase->updateCase( $_SESSION['APPLICATION'], $appFields ); //Save data
@@ -99,6 +103,10 @@ try {
$_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers ); $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
$_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES'] = $triggers; $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES'] = $triggers;
} }
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
$oCase->updateCase( $_SESSION['APPLICATION'], $appFields ); $oCase->updateCase( $_SESSION['APPLICATION'], $appFields );
// Send notifications - Start // Send notifications - Start

4
workflow/engine/methods/cases/cases_SaveData.php
View File

@@ -143,13 +143,13 @@ try {
//save data //save data
$aData = array (); $aData = array ();
$aData['APP_NUMBER'] = $Fields['APP_NUMBER']; $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['APP_DATA'] = $Fields['APP_DATA'];
$aData['DEL_INDEX'] = $_SESSION['INDEX']; $aData['DEL_INDEX'] = $_SESSION['INDEX'];
$aData['TAS_UID'] = $_SESSION['TASK']; $aData['TAS_UID'] = $_SESSION['TASK'];
$aData['CURRENT_DYNAFORM'] = $_GET['UID']; $aData['CURRENT_DYNAFORM'] = $_GET['UID'];
$aData['USER_UID'] = $_SESSION['USER_LOGGED']; $aData['USER_UID'] = $_SESSION['USER_LOGGED'];
$aData['APP_STATUS'] = $Fields['APP_STATUS']; //$aData['APP_STATUS'] = $Fields['APP_STATUS'];
$aData['PRO_UID'] = $_SESSION['PROCESS']; $aData['PRO_UID'] = $_SESSION['PROCESS'];
$oCase->updateCase( $_SESSION['APPLICATION'], $aData ); $oCase->updateCase( $_SESSION['APPLICATION'], $aData );

2
workflow/engine/methods/cases/cases_SaveDocument.php
View File

@@ -108,7 +108,7 @@ if ($_SESSION["TRIGGER_DEBUG"]["NUM_TRIGGERS"] > 0) {
//Save data //Save data
$arrayData = array(); $arrayData = array();
$arrayData["APP_NUMBER"] = $arrayField["APP_NUMBER"]; $arrayData["APP_NUMBER"] = $arrayField["APP_NUMBER"];
$arrayData["APP_PROC_STATUS"] = $arrayField["APP_PROC_STATUS"]; //$arrayData["APP_PROC_STATUS"] = $arrayField["APP_PROC_STATUS"];
$arrayData["APP_DATA"] = $arrayField["APP_DATA"]; $arrayData["APP_DATA"] = $arrayField["APP_DATA"];
$arrayData["DEL_INDEX"] = $_SESSION["INDEX"]; $arrayData["DEL_INDEX"] = $_SESSION["INDEX"];
$arrayData["TAS_UID"] = $_SESSION["TASK"]; $arrayData["TAS_UID"] = $_SESSION["TASK"];

8
workflow/engine/methods/cases/cases_Step.php
View File

@@ -170,6 +170,10 @@ if (isset( $_GET['breakpoint'] )) {
//Save data - Start //Save data - Start
unset($Fields['APP_STATUS']);
unset($Fields['APP_PROC_STATUS']);
unset($Fields['APP_PROC_CODE']);
unset($Fields['APP_PIN']);
$oCase->updateCase( $_SESSION['APPLICATION'], $Fields ); $oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
//Save data - End //Save data - End
@@ -527,6 +531,10 @@ try {
//Execute after triggers - End //Execute after triggers - End
//Save data - Start //Save data - Start
unset($Fields['APP_STATUS']);
unset($Fields['APP_PROC_STATUS']);
unset($Fields['APP_PROC_CODE']);
unset($Fields['APP_PIN']);
$oCase->updateCase( $_SESSION['APPLICATION'], $Fields ); $oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
//Save data - End //Save data - End