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

Merged in victorsl/processmaker/PM-1679 (pull request #1537)

Browse Source 
PM-00000 "Small fix in CaseScheduler.php"
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-26 08:41:54 -04:00
parent 69296e2e53 568720d632
commit 43c1f517c8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -53,8 +53,10 @@ class CaseScheduler extends BaseCaseScheduler
throw ($e); throw ($e);
} }
$con->commit(); $con->commit();
//Add Audit Log //Add Audit Log
$perform = $aData["SCH_OPTION"];
switch ($aData['SCH_OPTION']) { switch ($aData['SCH_OPTION']) {
case '1': case '1':
$perform = 'Daily'; $perform = 'Daily';
@@ -71,10 +73,10 @@ class CaseScheduler extends BaseCaseScheduler
case '5': case '5':
$perform = 'Every'; $perform = 'Every';
break; break;
} }
G::auditLog("CreateCaseScheduler", "Scheduler Name: ".$aData['SCH_NAME'].", Task: ".$aData['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$aData['SCH_START_DATE'].", End Date: ".$aData['SCH_END_DATE'].", Execution time : ".$aData['SCH_START_TIME']); G::auditLog("CreateCaseScheduler", "Scheduler Name: ".$aData['SCH_NAME'].", Task: ".$aData['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$aData['SCH_START_DATE'].", End Date: ".$aData['SCH_END_DATE'].", Execution time : ".$aData['SCH_START_TIME']);
return $result; return $result;
} catch (Exception $e) { } catch (Exception $e) {
$con->rollback(); $con->rollback();
@@ -92,7 +94,7 @@ class CaseScheduler extends BaseCaseScheduler
if ($this->validate()) { if ($this->validate()) {
$result = $this->save(); $result = $this->save();
$con->commit(); $con->commit();
//Add Audit Log //Add Audit Log
switch ($fields['SCH_OPTION']){ switch ($fields['SCH_OPTION']){
case '1': case '1':
@@ -112,7 +114,7 @@ class CaseScheduler extends BaseCaseScheduler
break; break;
} }
G::auditLog("UpdateCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$fields['SCH_START_DATE'].", End Date: ".$fields['SCH_END_DATE'].", Execution time : ".$fields['SCH_START_TIME']); G::auditLog("UpdateCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$fields['SCH_START_DATE'].", End Date: ".$fields['SCH_END_DATE'].", Execution time : ".$fields['SCH_START_TIME']);
return $result; return $result;
} else { } else {
$con->rollback(); $con->rollback();
@@ -135,7 +137,7 @@ class CaseScheduler extends BaseCaseScheduler
$con->commit(); $con->commit();
//Add Audit Log //Add Audit Log
G::auditLog("DeleteCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID']); G::auditLog("DeleteCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID']);
return $iResult; return $iResult;
} else { } else {
throw (new Exception( 'This row doesn\'t exist!' )); throw (new Exception( 'This row doesn\'t exist!' ));