From 6f73401b2cb38939ed4c34e892bfc2afe184b1dc Mon Sep 17 00:00:00 2001 From: dheeyi Date: Tue, 19 May 2015 10:38:06 -0400 Subject: [PATCH] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log:=20Al?= =?UTF-8?q?=20importar=20un=20proceso=20el=20audit=20log=20no=20indica=20q?= =?UTF-8?q?ue=20lo=20importa=20indica=20que=20se=20creo=20el=20proceso.=20?= =?UTF-8?q?Causa=20:=20Llamada=20al=20metodo=20Auditlog=20en=20esas=20situ?= =?UTF-8?q?aciones(Importaci=C3=B3=20Eliminaci=C3=B3e=20procesos).=20Soluc?= =?UTF-8?q?i=C3=B3=20=20Agregar=20el=20registro=20para=20el=20Auditlog=20e?= =?UTF-8?q?n=20situaciones=20de=20Importaci=C3=B3=20Eliminaci=C3=B3n=20pro?= =?UTF-8?q?cesos=20.pm,=20.pmx=20y=20bpmn.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/methods/processes/processes_Delete.php | 3 +-- workflow/engine/methods/processes/processes_Import_Ajax.php | 1 + workflow/engine/methods/setup/auditLog.php | 4 +++- .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php | 2 ++ .../engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Delete.php b/workflow/engine/methods/processes/processes_Delete.php index e3a5a15b1..7716414fc 100755 --- a/workflow/engine/methods/processes/processes_Delete.php +++ b/workflow/engine/methods/processes/processes_Delete.php @@ -42,7 +42,6 @@ if ($access != 1) { //$oProcessMap = new ProcessMap(); $uids = explode(',', $_POST['PRO_UIDS']); - try { foreach ($uids as $uid) { //$oProcessMap->deleteProcess($uid); @@ -53,7 +52,7 @@ try { $resp = new StdClass(); $resp->status = 0; $resp->msg = 'All process was deleted successfully'; - + G::auditLog("DeleteProcess", "Process UID : " . $_POST['PRO_UIDS']); echo G::json_encode($resp); } catch (Exception $e) { diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index b5e6bb253..0621053a1 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -226,6 +226,7 @@ if ($action == "uploadFileNewProcess") { $result->ExistGroupsInDatabase = ""; //"" -Default //0 -Dont exist process //1 -exist process + G::auditLog("ImportProcess", " PM -> Process UID : "); $optionGroupExistInDatabase = isset( $_REQUEST["optionGroupExistInDatabase"] ) ? $_REQUEST["optionGroupExistInDatabase"] : null; //!Upload file diff --git a/workflow/engine/methods/setup/auditLog.php b/workflow/engine/methods/setup/auditLog.php index 873bc590b..80f02f02c 100644 --- a/workflow/engine/methods/setup/auditLog.php +++ b/workflow/engine/methods/setup/auditLog.php @@ -150,7 +150,9 @@ $arrayAction = array( "AssignUserTask" => G::LoadTranslation("ID_ASSIGN_USER_TASK"), "AssignGroupTask" => G::LoadTranslation("ID_ASSIGN_GROUP_TASK"), "DeleteUserTask" => G::LoadTranslation("ID_DELETE_USER_TASK"), - "DeleteGroupTask" => G::LoadTranslation("ID_DELETE_GROUP_TASK") + "DeleteGroupTask" => G::LoadTranslation("ID_DELETE_GROUP_TASK"), + "ImportProcess" => G::LoadTranslation("ID_IMPORT_PROCESS"), + "DeleteProcess" => G::LoadTranslation("ID_DELETE_PROCESS") ); asort($arrayAction); diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 1fb12390e..1d29c769b 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -75,6 +75,8 @@ class BpmnWorkflow extends Project\Bpmn } $this->wp = new Project\Workflow(); + //Add AudiLog Import Process + \G::auditLog("ImportProcess", " PMX -> Process UID : " . $this->getUid()); $this->wp->create($wpData); } catch (\Exception $e) { diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php index 80b153d0f..f7885213b 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php @@ -59,6 +59,8 @@ class WorkflowBpmn extends Project\Workflow } $this->bp = new Project\Bpmn(); + //Add AudiLog Import Process + \G::auditLog("ImportProcess", " BPMN -> Process UID : " . $this->getUid()); $this->bp->create($bpData); // At this time we will add a default diagram and process