diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index 9af1a0cb1..8fe06512a 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -270,9 +270,9 @@ try { break; case 'deleteTask': $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); - G::auditlog("OptionsMenuTask",'Delete Stak -> '.$titleTask.' : '.$oData->tas_uid); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; + G::auditlog("DeleteTask",'Delete Task -> '.$titleTask.' : '.$oData->tas_uid); $sOutput = $oProcessMap->deleteTask($oData->tas_uid); break; case 'addGuide': @@ -482,9 +482,9 @@ try { case 'deleteAllRoutes': G::LoadClass('tasks'); $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); - G::auditlog("OptionsMenuTask",'Delete All Routes In -> '.$titleTask.' : '.$oData->tas_uid); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; + G::auditlog("DeleteRoutes",'Delete All Routes From Task -> '.$titleTask.' : '.$oData->tas_uid); $oTasks = new Tasks(); $oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid); break; @@ -525,10 +525,10 @@ try { break; case 'deleteSubProcess': $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); - G::auditlog("OptionsMenuTask",'Delete Sub Process -> '.$titleTask.' : '.$oData->tas_uid); - $sOutput = $oProcessMap->deleteSubProcess($oData->pro_uid, $oData->tas_uid); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; + G::auditlog("DeleteSubProcess",'Delete Sub-Process -> '.$titleTask.' : '.$oData->tas_uid); + $sOutput = $oProcessMap->deleteSubPrcocess($oData->pro_uid, $oData->tas_uid); break; case 'subProcess_Properties': $oProcessMap->subProcess_Properties($oData->pro_uid, $oData->tas_uid, $oData->index); diff --git a/workflow/engine/methods/steps/conditions_Save.php b/workflow/engine/methods/steps/conditions_Save.php index 7bbc3aa58..35b6077d0 100755 --- a/workflow/engine/methods/steps/conditions_Save.php +++ b/workflow/engine/methods/steps/conditions_Save.php @@ -43,7 +43,7 @@ try { $value = $_POST; $oStep->update( array ('STEP_UID' => $value['STEP_UID'],'STEP_CONDITION' => $value['STEP_CONDITION'] ) ); - G::auditlog("OptionsMenuTask","Save Condition In Step -> ".$value['STEP_UID'].' In Task -> '.$value['TAS_UID'].' Condition -> '.$value['STEP_CONDITION']); + G::auditlog("OptionsMenuTask","Save Condition From Step -> ".$value['STEP_UID'].' In Task -> '.$value['TAS_UID'].' Condition -> '.$value['STEP_CONDITION']); G::LoadClass( 'processMap' ); $oProcessMap = new ProcessMap(); $oProcessMap->getStepsCriteria( $value['TAS_UID'] ); diff --git a/workflow/engine/methods/steps/steps_Ajax.php b/workflow/engine/methods/steps/steps_Ajax.php index 7c89bbf5a..58639a052 100755 --- a/workflow/engine/methods/steps/steps_Ajax.php +++ b/workflow/engine/methods/steps/steps_Ajax.php @@ -118,7 +118,7 @@ try { } break; case 'assignTrigger': - G::auditlog("OptionsMenuTask","Assign Trigger In Step-> ".$aData['STEP_UID'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['ST_TYPE'].' Condition -> '.$aData['ST_CONDITION'].' Trigger UID -> '.$aData['TRI_UID']); + G::auditlog("OptionsMenuTask","Assign Trigger From Step -> ".$aData['STEP_UID'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['ST_TYPE'].' Condition -> '.$aData['ST_CONDITION'].' Trigger UID -> '.$aData['TRI_UID']); $aFields = array ( 'STEP_UID' => $aData['STEP_UID'], 'TAS_UID' => $_SESSION['TASK'], diff --git a/workflow/engine/methods/steps/steps_Delete.php b/workflow/engine/methods/steps/steps_Delete.php index 95ffabcf0..1e0dc6a4a 100755 --- a/workflow/engine/methods/steps/steps_Delete.php +++ b/workflow/engine/methods/steps/steps_Delete.php @@ -39,7 +39,7 @@ try { $oStep = new Step(); $oStep->reOrder( $_POST['STEP_UID'], $_POST['STEP_POSITION'] ); $oStep->remove( $_POST['STEP_UID'] ); - G::auditlog("OptionsMenuTask","Step Delete -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']); + G::auditlog("OptionsMenuTask","Step Deleted -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']); G::LoadClass( 'processMap' ); $oProcessMap = new ProcessMap(); $oProcessMap->getStepsCriteria( $_POST['TASK'] ); diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index 727161232..c3c79059a 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -86,11 +86,11 @@ try { switch ((int) $_POST['TU_RELATION']) { case 1: echo $oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - G::auditlog("OptionsMenuTask","Assign User In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); + G::auditlog("OptionsMenuTask","Assign a User to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); break; case 2: echo $oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - G::auditlog("OptionsMenuTask","Assign Group In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); + G::auditlog("OptionsMenuTask","Assign a Group to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); break; } break; @@ -100,11 +100,11 @@ try { switch ((int) $_POST['TU_RELATION']) { case 1: echo $oTasks->ofToAssignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - G::auditlog("OptionsMenuTask","Delete Group In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); + G::auditlog("OptionsMenuTask"," Delete a User from a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); break; case 2: echo $oTasks->ofToAssignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - G::auditlog("OptionsMenuTask","Delete User In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); + G::auditlog("OptionsMenuTask","Delete a Group from a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']); break; } break;