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

PMCORE-2335

Browse Source
This commit is contained in:
Andrea Adamczyk
2021-02-24 08:44:16 -04:00
parent b789470fb9
commit 2f10c3ed3e
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25619,6 +25619,12 @@ msgstr "Table Name"
msgid "[LABEL/ID_TABLE_NAME_IS_REQUIRED] Table Name is required." msgid "[LABEL/ID_TABLE_NAME_IS_REQUIRED] Table Name is required."
msgstr "Table Name is required." msgstr "Table Name is required."
# TRANSLATION
# LABEL/ID_TABLE_AND_PROCESS_NAME_ARE_REQUIRED
#: LABEL/ID_TABLE_AND_PROCESS_NAME_ARE_REQUIRED
msgid "Table and Process Name are required."
msgstr "Table and Process Name are required."
# TRANSLATION # TRANSLATION
# LABEL/ID_TABLE_NAME_TOO_SHORT # LABEL/ID_TABLE_NAME_TOO_SHORT
#: LABEL/ID_TABLE_NAME_TOO_SHORT #: LABEL/ID_TABLE_NAME_TOO_SHORT

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

@@ -61189,6 +61189,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_TABLE_INVALID_SYNTAX','en','Invalid syntax','2014-01-15') , ( 'LABEL','ID_TABLE_INVALID_SYNTAX','en','Invalid syntax','2014-01-15') ,
( 'LABEL','ID_TABLE_NAME','en','Table Name','2014-01-15') , ( 'LABEL','ID_TABLE_NAME','en','Table Name','2014-01-15') ,
( 'LABEL','ID_TABLE_NAME_IS_REQUIRED','en','Table Name is required.','2014-01-15') , ( 'LABEL','ID_TABLE_NAME_IS_REQUIRED','en','Table Name is required.','2014-01-15') ,
( 'LABEL','ID_TABLE_AND_PROCESS_NAME_ARE_REQUIRED','en','Table and Process Name are required.','2021-02-24') ,
( 'LABEL','ID_TABLE_NAME_TOO_SHORT','en','The table name is too short, it should have at least 4 characters.','2014-01-15') , ( 'LABEL','ID_TABLE_NAME_TOO_SHORT','en','The table name is too short, it should have at least 4 characters.','2014-01-15') ,
( 'LABEL','ID_TABLE_NOT_EXIST_SKIPPED','en','Table does not exist... skipped!','2014-01-15') , ( 'LABEL','ID_TABLE_NOT_EXIST_SKIPPED','en','Table does not exist... skipped!','2014-01-15') ,
( 'LABEL','ID_TABLE_NOT_FOUND','en','Table Not found','2014-01-15') , ( 'LABEL','ID_TABLE_NOT_FOUND','en','Table Not found','2014-01-15') ,

22
workflow/engine/templates/pmTables/editReport.js
View File

@@ -955,9 +955,6 @@ Ext.onReady(function () {
}); });
var items = new Array(); var items = new Array();
if (PRO_UID === false) {
items.push(processComboBox);
}
items.push({ items.push({
id: 'REP_TAB_NAME', id: 'REP_TAB_NAME',
@@ -974,6 +971,11 @@ Ext.onReady(function () {
} }
} }
}); });
if (PRO_UID === false) {
items.push(processComboBox);
}
items.push({ items.push({
id: 'REP_TAB_DSC', id: 'REP_TAB_DSC',
fieldLabel: _("ID_DESCRIPTION"), fieldLabel: _("ID_DESCRIPTION"),
@@ -1115,6 +1117,19 @@ function createReportTable()
var tableName = Ext.getCmp('REP_TAB_NAME').getValue().trim(); var tableName = Ext.getCmp('REP_TAB_NAME').getValue().trim();
var tableDescription = Ext.getCmp('REP_TAB_DSC').getValue().trim(); var tableDescription = Ext.getCmp('REP_TAB_DSC').getValue().trim();
PRO_UID = (PRO_UID !== false && PRO_UID !== "") ? PRO_UID : ((Ext.getCmp('PROCESS').getValue().trim() != '') ? Ext.getCmp('PROCESS').getValue().trim() : '');
//validate table name and process
if (Ext.getCmp('REP_TAB_NAME').getValue().trim() == '' && PRO_UID == '') {
Ext.getCmp('PROCESS').focus();
Ext.getCmp('REP_TAB_NAME').focus();
PMExt.error(_('ID_ERROR'), _('ID_TABLE_AND_PROCESS_NAME_ARE_REQUIRED'), function () {
Ext.getCmp('PROCESS').focus();
Ext.getCmp('REP_TAB_NAME').focus();
});
return false;
}
//validate table name //validate table name
if (Ext.getCmp('REP_TAB_NAME').getValue().trim() == '') { if (Ext.getCmp('REP_TAB_NAME').getValue().trim() == '') {
Ext.getCmp('REP_TAB_NAME').focus(); Ext.getCmp('REP_TAB_NAME').focus();
@@ -1125,7 +1140,6 @@ function createReportTable()
} }
//validate process //validate process
PRO_UID = (PRO_UID !== false && PRO_UID !== "") ? PRO_UID : ((Ext.getCmp('PROCESS').getValue().trim() != '') ? Ext.getCmp('PROCESS').getValue().trim() : '');
if (PRO_UID == '') { if (PRO_UID == '') {
Ext.getCmp('PROCESS').focus(); Ext.getCmp('PROCESS').focus();
PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function () { PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function () {