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

Merged in bugfix/HOR-2909 (pull request #5683)

Browse Source 
HOR-2909

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2017-05-24 19:51:02 +00:00
committed by Julio Cesar Laura Avendaño
parent f984d334c0 cd070683c3
commit de39ea54e7
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.consolidatedCases.php
View File

@@ -24,7 +24,7 @@ class ConsolidatedCases
return true;
}
if ($this->existTable && $Status) {
throw (new \Exception(\G::LoadTranslation("ID_TABLE_ALREADY_EXISTS")));
throw (new \Exception(\G::LoadTranslation("ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS")));
}
if ($RepTabUid != '') {

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -1465,6 +1465,12 @@ msgstr "Please enter the required fields"
msgid "Table already exists"
msgstr "Table already exists"
# TRANSLATION
# LABEL/ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS
#: LABEL/ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS
msgid "The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration."
msgstr "The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration."
# TRANSLATION
# LABEL/ID_LANGUAGES
#: LABEL/ID_LANGUAGES

1
workflow/engine/data/mysql/insert.sql
View File

@@ -1684,6 +1684,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PLEASE_ENTER_REQUIRED_FIELDS','en','Please enter the required fields','2014-01-15') ,
( 'LABEL','ID_TABLE_ALREADY_EXISTS','en','Table already exists','2014-01-15') ,
( 'LABEL','ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS','en','The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration.','2017-03-27') ,
( 'LABEL','ID_LANGUAGES','en','Language','2014-01-15') ,
( 'LABEL','ID_EXPORT','en','Export','2014-01-15') ,
( 'LABEL','ID_MSG_CONFIRM_REMOVE_LANGUAGE','en','Are you sure you want to remove this language?','2014-01-15') ,

2
workflow/engine/xmlform/tasks/tasks_Consolidated.xml
View File

@@ -69,7 +69,7 @@
case 1:
tableName.failed();
if(confirm("The table name already exists\n\nDo you want to overwrite the table?")) {
if(confirm("@G::LoadTranslation(ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS)")) {
conSaveProperties(1);
}
break;