fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

Browse Source
This commit is contained in:
Dante
2016-02-29 09:29:38 -04:00
parent db83764021 5c4763ca71
commit 6e56feb708
9 changed files with 144 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -222,6 +222,7 @@ $oHeadPublisher->addExtJsScript( 'app/main', true );
$oHeadPublisher->addExtJsScript( 'cases/casesList', false ); //adding a javascript file .js
$oHeadPublisher->addContent( 'cases/casesListExtJs' ); //adding a html file .html.
$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
$oHeadPublisher->assign('extJsViewState', $oHeadPublisher->getExtJsViewState());
$ieVersion = null;
if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
$ieVersion = intval($arrayMatch[1]);

1
workflow/engine/methods/processes/mainInit.php
View File

@@ -78,6 +78,7 @@ $oHeadPublisher->assign("arrayFlagImportFileExtension", $arrayFlagImportFileExte
$oHeadPublisher->assign("arrayFlagMenuNewOption", $arrayFlagMenuNewOption);
$oHeadPublisher->assign("arrayMenuNewOptionPlugin", $arrayMenuNewOptionPlugin);
$oHeadPublisher->assign("arrayContextMenuOptionPlugin", $arrayContextMenuOptionPlugin);
$oHeadPublisher->assign('extJsViewState', $oHeadPublisher->getExtJsViewState());
$oPluginRegistry = & PMPluginRegistry::getSingleton();
$callBackFile = $oPluginRegistry->getImportProcessCallback();

2
workflow/engine/templates/cases/casesList.js
View File

@@ -481,7 +481,7 @@ function redirect(href){
}
Ext.onReady ( function() {
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
setExtStateManagerSetProvider('casesGrid', action);
var ids = '';
var filterProcess = '';

2
workflow/engine/templates/processes/main.js
View File

@@ -44,7 +44,7 @@ Ext.apply(Ext.form.VTypes, {
});
Ext.onReady(function(){
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
setExtStateManagerSetProvider('gridProcessMain');
Ext.QuickTips.init();
store = new Ext.data.GroupingStore( {