From 16dbcc29107b2a63aa351dae5b52479d294c45c6 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Sat, 21 Feb 2015 10:25:27 -0400 Subject: [PATCH 1/2] Fixing bug with audit log when the next task is end of process --- .../methods/processes/processes_Ajax.php | 70 +++++++++++++------ 1 file changed, 49 insertions(+), 21 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index 1cd4c9bb8..1b4cd4fea 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -379,9 +379,13 @@ try { $oTaskNewPattern = new Task(); $taskInfo=$oTaskNewPattern->load($oData->tas_uid); $titleTask=$taskInfo['TAS_TITLE']; - $oTaskNextNewPattern = new Task(); - $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + if ($oData->next_task != "-1") { + $oTaskNextNewPattern = new Task(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$taskNextInfo['TAS_TITLE']; + } else { + $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); + } if ($titleNextTask=='') { G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : END OF PROCESS Task Name -> '.$titleTask.' : '.$oData->tas_uid); }else{ @@ -396,9 +400,13 @@ try { $oTaskNewPattern = new Task(); $taskInfo=$oTaskNewPattern->load($oData->tas_uid); $titleTask=$taskInfo['TAS_TITLE']; - $oTaskNextNewPattern = new Task(); - $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + if ($oData->next_task != "-1") { + $oTaskNextNewPattern = new Task(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; + } else { + $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); + } G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 2: @@ -409,9 +417,13 @@ try { $oTaskNewPattern = new Task(); $taskInfo=$oTaskNewPattern->load($oData->tas_uid); $titleTask=$taskInfo['TAS_TITLE']; - $oTaskNextNewPattern = new Task(); - $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + if ($oData->next_task != "-1") { + $oTaskNextNewPattern = new Task(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; + } else { + $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); + } G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 3: @@ -422,9 +434,13 @@ try { $oTaskNewPattern = new Task(); $taskInfo=$oTaskNewPattern->load($oData->tas_uid); $titleTask=$taskInfo['TAS_TITLE']; - $oTaskNextNewPattern = new Task(); - $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + if ($oData->next_task != "-1") { + $oTaskNextNewPattern = new Task(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; + } else { + $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); + } G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 4: @@ -435,9 +451,13 @@ try { $oTaskNewPattern = new Task(); $taskInfo=$oTaskNewPattern->load($oData->tas_uid); $titleTask=$taskInfo['TAS_TITLE']; - $oTaskNextNewPattern = new Task(); - $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + if ($oData->next_task != "-1") { + $oTaskNextNewPattern = new Task(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; + } else { + $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); + } G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 5: @@ -447,9 +467,13 @@ try { $oTaskNewPattern = new Task(); $taskInfo=$oTaskNewPattern->load($oData->tas_uid); $titleTask=$taskInfo['TAS_TITLE']; - $oTaskNextNewPattern = new Task(); - $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + if ($oData->next_task != "-1") { + $oTaskNextNewPattern = new Task(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; + } else { + $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); + } G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 8: @@ -459,9 +483,13 @@ try { $oTaskNewPattern = new Task(); $taskInfo=$oTaskNewPattern->load($oData->tas_uid); $titleTask=$taskInfo['TAS_TITLE']; - $oTaskNextNewPattern = new Task(); - $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + if ($oData->next_task != "-1") { + $oTaskNextNewPattern = new Task(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; + } else { + $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); + } G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; } From 27f4cbd7de83171d5bced107302d09e468c25b69 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Sat, 21 Feb 2015 10:26:50 -0400 Subject: [PATCH 2/2] Fixing bug with audit log when the next task is end of process --- workflow/engine/methods/processes/processes_Ajax.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index 1b4cd4fea..bb3b3555a 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -403,7 +403,7 @@ try { if ($oData->next_task != "-1") { $oTaskNextNewPattern = new Task(); $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + $titleNextTask=$taskNextInfo['TAS_TITLE']; } else { $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); } @@ -420,7 +420,7 @@ try { if ($oData->next_task != "-1") { $oTaskNextNewPattern = new Task(); $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + $titleNextTask=$taskNextInfo['TAS_TITLE']; } else { $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); } @@ -437,7 +437,7 @@ try { if ($oData->next_task != "-1") { $oTaskNextNewPattern = new Task(); $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + $titleNextTask=$taskNextInfo['TAS_TITLE']; } else { $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); } @@ -454,7 +454,7 @@ try { if ($oData->next_task != "-1") { $oTaskNextNewPattern = new Task(); $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + $titleNextTask=$taskNextInfo['TAS_TITLE']; } else { $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); } @@ -470,7 +470,7 @@ try { if ($oData->next_task != "-1") { $oTaskNextNewPattern = new Task(); $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + $titleNextTask=$taskNextInfo['TAS_TITLE']; } else { $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); } @@ -486,7 +486,7 @@ try { if ($oData->next_task != "-1") { $oTaskNextNewPattern = new Task(); $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$$taskNextInfo['TAS_TITLE']; + $titleNextTask=$taskNextInfo['TAS_TITLE']; } else { $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS"); }