From 04255585bbc17c2b0ed36b57e547c049995a1f7e Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Mon, 18 Aug 2014 15:07:54 -0400 Subject: [PATCH 1/3] BUG-15567 Cases List Problema con los idiomas al traducir... SOLVED - It don't have the functionality. - The ___() function was changed to return the lable without *** if it this is not found. - HOME columns translations, inside the Enterprise, were included. --- gulliver/js/common/core/common.js | 2 +- gulliver/js/ext/min/ext-all.js | 2 +- gulliver/js/ext/pmos-common.js | 2 +- gulliver/js/maborak/core/maborak.js | 2 +- workflow/engine/methods/cases/casesListExtJs.php | 4 ++++ workflow/engine/templates/cases/casesList.js | 3 +++ 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js index 7e13ad7ad..8612c692c 100755 --- a/gulliver/js/common/core/common.js +++ b/gulliver/js/common/core/common.js @@ -2191,7 +2191,7 @@ function __() eval("trn = TRANSLATIONS_" + argv[0].toUpperCase() + "[argv[1]];"); } } else { - trn = '**' + argv[1] + '**'; + trn = argv[1]; } } else { PMExt.error('Processmaker JS Core Error', 'The TRANSLATIONS ' + argv[0].toUpperCase() + ' global object is not loaded!'); diff --git a/gulliver/js/ext/min/ext-all.js b/gulliver/js/ext/min/ext-all.js index 7912bff9f..95c6e6114 100644 --- a/gulliver/js/ext/min/ext-all.js +++ b/gulliver/js/ext/min/ext-all.js @@ -36,7 +36,7 @@ else{trn='**'+argv[0]+'**';}} else{PMExt.error('Processmaker JS Core Error','The TRANSLATIONS global object is not loaded!');trn='';} return trn;} function __() -{var argv=__.arguments;var argc=argv.length;var existTranslations=true;var existIdLabel=true;eval("if( typeof TRANSLATIONS_"+argv[0].toUpperCase()+" != 'undefined' && TRANSLATIONS_"+argv[0].toUpperCase()+") { existTranslations = true; } else { existTranslations = false; }");if(existTranslations){eval("if( typeof TRANSLATIONS_"+argv[0].toUpperCase()+"[argv[1]] != 'undefined' ) { existIdLabel = true; } else { existIdLabel = false; }");if(existIdLabel){if(argc>2){eval("trn = TRANSLATIONS_"+argv[0].toUpperCase()+"[argv[0]];");for(i=2;i2){eval("trn = TRANSLATIONS_"+argv[0].toUpperCase()+"[argv[0]];");for(i=2;i2){eval("trn = TRANSLATIONS_"+argv[0].toUpperCase()+"[argv[0]];");for(i=2;i2){eval("trn = TRANSLATIONS_"+argv[0].toUpperCase()+"[argv[0]];");for(i=2;iassign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy $oHeadPublisher->addExtJsScript( 'cases/reassignList', false ); +if (class_exists( 'enterprisePlugin' )) { + $oHeadPublisher->addExtJsScript(PATH_PLUGINS . "enterprise" . PATH_SEP . "advancedTools" . PATH_SEP , false, true); +} + $oHeadPublisher->assign( 'pageSize', $pageSize ); //sending the page size $oHeadPublisher->assign( 'columns', $columns ); //sending the columns to display in grid $oHeadPublisher->assign( 'readerFields', $readerFields ); //sending the fields to get from proxy diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index c6736516a..093c60727 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -591,6 +591,9 @@ Ext.onReady ( function() { if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name; if( c.dataIndex == 'APP_CURRENT_USER') c.renderer = full_name; } + if (c.header.substring(0, 3) == 'ID_') { + c.header = __('enterprise', c.header); + } } //adding the hidden field DEL_INIT_DATE From 202d75acadf07d4fad7ef871a672925cfa0315a7 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 20 Aug 2014 14:19:04 -0400 Subject: [PATCH 2/3] BUG-15567 Cases List Problema con los idiomas al traducir... SOLVED - It don't have the functionality. - The ___() function was changed to return the lable without *** if it this is not found. - HOME columns translations, inside the Enterprise, were included. --- gulliver/js/common/core/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js index 8612c692c..2620b3444 100755 --- a/gulliver/js/common/core/common.js +++ b/gulliver/js/common/core/common.js @@ -2191,7 +2191,7 @@ function __() eval("trn = TRANSLATIONS_" + argv[0].toUpperCase() + "[argv[1]];"); } } else { - trn = argv[1]; + trn = argv[1]; } } else { PMExt.error('Processmaker JS Core Error', 'The TRANSLATIONS ' + argv[0].toUpperCase() + ' global object is not loaded!'); From 125afc06f5ad364c5008ea0f933bd5bf39cea00d Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Thu, 21 Aug 2014 12:35:24 -0400 Subject: [PATCH 3/3] BUG-15567 Cases List Problema con los idiomas al traducir... SOLVED - It don't have the functionality. - The ___() function was changed to return the lable without *** if it this is not found. - HOME columns translations, inside the Enterprise, were included. --- gulliver/js/common/core/common.js | 2 +- gulliver/js/ext/min/ext-all.js | 2 +- gulliver/js/ext/pmos-common.js | 2 +- gulliver/js/maborak/core/maborak.js | 2 +- workflow/engine/templates/cases/casesList.js | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js index 2620b3444..7a8e15424 100755 --- a/gulliver/js/common/core/common.js +++ b/gulliver/js/common/core/common.js @@ -2154,7 +2154,7 @@ function _() } } else { - trn = '**' + argv[0] + '**'; + trn = argv[0]; } } else { diff --git a/gulliver/js/ext/min/ext-all.js b/gulliver/js/ext/min/ext-all.js index 95c6e6114..2ab06e1e1 100644 --- a/gulliver/js/ext/min/ext-all.js +++ b/gulliver/js/ext/min/ext-all.js @@ -32,7 +32,7 @@ if(image!=''){Ext.get('x-box-mc-inner').setStyle('background-image','url("'+imag Ext.get('x-box-mc-inner').setStyle('background-position','5px 10px');Ext.get('x-box-mc-inner').setStyle('background-repeat','no-repeat');Ext.get('x-box-mc-inner').setStyle('padding-left','45px');m.slideIn('t').pause(time).ghost("t",{remove:true});}};}();function _() {var argv=_.arguments;var argc=argv.length;if(typeof TRANSLATIONS!='undefined'&&TRANSLATIONS){if(typeof TRANSLATIONS[argv[0]]!='undefined'){if(argc>1){trn=TRANSLATIONS[argv[0]];for(i=1;i1){trn=TRANSLATIONS[argv[0]];for(i=1;i