From 7f93f9036e2f6bd6ef663fd2e6131f5db95c7e67 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Sat, 21 Feb 2015 12:17:32 -0400 Subject: [PATCH] Adding a couple of missing labels for audit log --- .../translations/english/processmaker.en.po | 14 +++++++++++++- workflow/engine/data/mssql/insert.sql | 4 ++++ workflow/engine/data/mysql/insert.sql | 4 +++- workflow/engine/methods/events/eventsDelete.php | 2 +- workflow/engine/methods/events/eventsSave.php | 2 +- workflow/engine/methods/events/triggersSave.php | 2 +- workflow/engine/methods/setup/auditLog.php | 3 ++- 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 38305bc2e..90e0a22e0 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ProcessMaker 3.0\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2015-02-21 08:23:36\n" +"PO-Revision-Date: 2015-02-21 11:15:01\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -18307,6 +18307,18 @@ msgstr "The variables do not meet with the definition of Message-Type-Variable" msgid "The Message-Event-Definition with {0}: {1} does not is registered." msgstr "The Message-Event-Definition with {0}: {1} does not is registered." +# TRANSLATION +# LABEL/ID_EDIT_PROCESS +#: LABEL/ID_EDIT_PROCESS +msgid "Process Edited" +msgstr "Process Edited" + +# TRANSLATION +# LABEL/ID_EVENT_DELETED +#: LABEL/ID_EVENT_DELETED +msgid "Event deleted" +msgstr "Event deleted" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index eb4ad50a1..18865b476 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -7563,6 +7563,10 @@ SELECT 'LABEL','ID_MESSAGE_EVENT_DEFINITION_ALREADY_REGISTERED','en','The Messag SELECT 'LABEL','ID_MESSAGE_EVENT_DEFINITION_VARIABLES_DO_NOT_MEET_DEFINITION','en','The variables do not meet with the definition of Message-Type-Variable','2015-02-20' UNION ALL SELECT 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_IS_REGISTERED','en','The Message-Event-Definition with {0}: {1} does not is registered.','2015-02-20' + UNION ALL +SELECT 'LABEL','ID_EDIT_PROCESS','en','Process Edited','2015-02-21' + UNION ALL +SELECT 'LABEL','ID_EVENT_DELETED','en','Event deleted','2015-02-21' ; INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 486856cbf..fd70d295d 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -4514,7 +4514,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_EXIST','en','The Message-Event-Definition with {0}: {1} does not exist.','2015-02-20') , ( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_ALREADY_REGISTERED','en','The Message-Event-Definition with {0}: {1} already registered.','2015-02-20') , ( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_VARIABLES_DO_NOT_MEET_DEFINITION','en','The variables do not meet with the definition of Message-Type-Variable','2015-02-20') , -( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_IS_REGISTERED','en','The Message-Event-Definition with {0}: {1} does not is registered.','2015-02-20') ; +( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_IS_REGISTERED','en','The Message-Event-Definition with {0}: {1} does not is registered.','2015-02-20') , +( 'LABEL','ID_EDIT_PROCESS','en','Process Edited','2015-02-21') , +( 'LABEL','ID_EVENT_DELETED','en','Event deleted','2015-02-21') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , diff --git a/workflow/engine/methods/events/eventsDelete.php b/workflow/engine/methods/events/eventsDelete.php index 373883cbf..b5e37dd12 100755 --- a/workflow/engine/methods/events/eventsDelete.php +++ b/workflow/engine/methods/events/eventsDelete.php @@ -34,7 +34,7 @@ $proUid = $eventFields['PRO_UID']; $infoProcess = new Process(); $resultProcess = $infoProcess->load($proUid); -G::auditLog('Events','Delete event ('.$_POST['EVN_UID'].') in process "'.$resultProcess['PRO_TITLE'].'"'); +G::auditLog('DeleteEvent','Delete event ('.$_POST['EVN_UID'].') in process "'.$resultProcess['PRO_TITLE'].'"'); $evnUid = $_POST['EVN_UID']; require_once 'classes/model/Event.php'; diff --git a/workflow/engine/methods/events/eventsSave.php b/workflow/engine/methods/events/eventsSave.php index eff6a99db..c9b894909 100755 --- a/workflow/engine/methods/events/eventsSave.php +++ b/workflow/engine/methods/events/eventsSave.php @@ -62,7 +62,7 @@ if ($_POST['form']['EVN_UID'] == '') { $infoProcess = new Process(); $resultProcess = $infoProcess->load($_POST['form']['PRO_UID']); -G::auditLog('Events','Save intermediate message ('.$_POST['form']['EVN_UID'].') in process "'.$resultProcess['PRO_TITLE'].'"'); +G::auditLog('EditEvent','Save intermediate message ('.$_POST['form']['EVN_UID'].') in process "'.$resultProcess['PRO_TITLE'].'"'); function replaceQuotes ($aData) { diff --git a/workflow/engine/methods/events/triggersSave.php b/workflow/engine/methods/events/triggersSave.php index d16381f75..f2d41db12 100755 --- a/workflow/engine/methods/events/triggersSave.php +++ b/workflow/engine/methods/events/triggersSave.php @@ -42,5 +42,5 @@ $proUid = $triggerFields['PRO_UID']; $infoProcess = new Process(); $resultProcess = $infoProcess->load($proUid); -G::auditLog('Events','Save event ('.$_POST['form']['TRI_UID'].') in process "'.$resultProcess['PRO_TITLE'].'"'); +G::auditLog('EditEvent','Save trigger from event ('.$_POST['form']['TRI_UID'].') in process "'.$resultProcess['PRO_TITLE'].'"'); diff --git a/workflow/engine/methods/setup/auditLog.php b/workflow/engine/methods/setup/auditLog.php index 2c7b37f78..fe7976aea 100644 --- a/workflow/engine/methods/setup/auditLog.php +++ b/workflow/engine/methods/setup/auditLog.php @@ -112,7 +112,8 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )), array ("AssignSupervisorInput", G::LoadTranslation( "ID_ASSIGN_SUPERVISOR_INPUT" )), array ("RemoveSupervisorInput", G::LoadTranslation( "ID_REMOVE_SUPERVISOR_INPUT" )), array ("CaseTrackers", G::LoadTranslation( "ID_CASE_TRACKERS" )), - array ("Events", G::LoadTranslation( "ID_EDIT_PROCESS" )), + array ("EditEvent", G::LoadTranslation( "ID_EDIT_EVENT" )), + array ("DeleteEvent", G::LoadTranslation( "ID_EVENT_DELETED" )), array ("CreateDynaform", G::LoadTranslation( "ID_CREATE_DYNAFORM" )), array ("UpdateDynaform", G::LoadTranslation( "ID_UPDATE_DYNAFORM" )), array ("DeleteDynaform", G::LoadTranslation( "ID_DELETE_DYNAFORM" )),