From 30545631ccd201df85d4fc9b96add414ffc08971 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 18 Apr 2016 10:24:42 -0400 Subject: [PATCH] HOR-774 HOR-774 --- workflow/engine/classes/class.pmFunctions.php | 8 ++++---- .../content/translations/english/processmaker.en.po | 6 ++++++ workflow/engine/data/mssql/insert.sql | 2 ++ workflow/engine/data/mysql/insert.sql | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index 85d47d8f5..1960452d3 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -279,16 +279,16 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter } if(isset($nameOfTable) && $nameOfTable !== ''){ if(in_array($nameOfTable,$aListAllTables)){ - G::SendTemporalMessage( 'ID_NOT_EXECUTE_QUERY', 'error', 'labels' ); - throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY')); + G::SendTemporalMessage( G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable)), 'error', 'labels' ); + throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable))); } } if (is_array($arrayOfTables)){ foreach ($arrayOfTables as $row){ if(!empty($row)){ if(in_array($row, $aListAllTables)){ - G::SendTemporalMessage( 'ID_NOT_EXECUTE_QUERY', 'error', 'labels' ); - throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY')); + G::SendTemporalMessage(G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable)), 'error', 'labels' ); + throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable))); } } } diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 9a5944a7c..2341846c8 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -24391,6 +24391,12 @@ msgstr "The user with \"{0}\" is invalid to cancel the Case." msgid "The user with \"{0}\" did not have permission to perform this action." msgstr "The user with \"{0}\" did not have permission to perform this action." +# TRANSLATION +# LABEL/ID_NOT_EXECUTE_QUERY +#: LABEL/ID_NOT_EXECUTE_QUERY +msgid "Changes to {0} are forbidden. Please contact system administrator for more information." +msgstr "Changes to {0} are forbidden. Please contact system administrator for more information." + # TRANSLATION # LABEL/ID_EMAIL_MORE_THAN_ONE_USER #: LABEL/ID_EMAIL_MORE_THAN_ONE_USER diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 9cc6698b7..caff8e93b 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -9644,6 +9644,8 @@ SELECT 'LABEL','ID_NO_LICENSE_FEATURE_ENABLED','en','Your license does not have UNION ALL SELECT 'LABEL','ID_USER_NOT_ACTIVE','en','The user is not active.','2015-09-08' UNION ALL +SELECT 'LABEL','ID_NOT_EXECUTE_QUERY','en','Changes to {0} are forbidden. Please contact system administrator for more information.','2016-04-11' + UNION ALL SELECT 'LABEL','ID_MAFE_b776b96aded5145322e09111013ef8c5','en','Invalid connection type','2016-03-30' UNION ALL SELECT 'LABEL','ID_MAFE_89d626523f83c2d1f8a5549a845dd6aa','en','Start Event must have an outgoing sequence flow','2016-03-30' diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 3fe39567f..1967ac68f 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -5578,6 +5578,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_USER_DOES_NOT_CORRESPOND','en','Wrong authentication. This user does not correspond with the email address.','2015-09-08') , ( 'LABEL','ID_NO_LICENSE_FEATURE_ENABLED','en','Your license does not have the Gmail integration. Please contact your administrator.','2015-09-17') , ( 'LABEL','ID_USER_NOT_ACTIVE','en','The user is not active.','2015-09-08') , +( 'LABEL','ID_NOT_EXECUTE_QUERY','en','Changes to {0} are forbidden. Please contact system administrator for more information.','2016-04-11') , ( 'LABEL','ID_MAFE_b776b96aded5145322e09111013ef8c5','en','Invalid connection type','2016-03-30') , ( 'LABEL','ID_MAFE_89d626523f83c2d1f8a5549a845dd6aa','en','Start Event must have an outgoing sequence flow','2016-03-30') , ( 'LABEL','ID_MAFE_d4bff85814308aca1cfde4b977872550','en','Start Event must not have an incommig sequence flow','2016-03-30') ,