diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js index 7e13ad7ad..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 { @@ -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..2ab06e1e1 100644 --- a/gulliver/js/ext/min/ext-all.js +++ b/gulliver/js/ext/min/ext-all.js @@ -32,11 +32,11 @@ 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;i2){eval("trn = TRANSLATIONS_"+argv[0].toUpperCase()+"[argv[0]];");for(i=2;i2){eval("trn = TRANSLATIONS_"+argv[0].toUpperCase()+"[argv[0]];");for(i=2;i1){trn=TRANSLATIONS[argv[0]];for(i=1;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..d0bdd1a39 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -591,6 +591,7 @@ 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; } + c.header = __('enterprise', _(c.header)); } //adding the hidden field DEL_INIT_DATE