diff --git a/workflow/engine/methods/cases/main.php b/workflow/engine/methods/cases/main.php index 71073bc07..6b7640db2 100755 --- a/workflow/engine/methods/cases/main.php +++ b/workflow/engine/methods/cases/main.php @@ -28,6 +28,8 @@ $RBAC->requirePermissions('PM_CASES'); $G_MAIN_MENU = 'processmaker'; $G_ID_MENU_SELECTED = 'CASES'; +$_POST['qs'] = isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '' ? '?' . $_SERVER['QUERY_STRING'] : ''; + $G_PUBLISH = new Publisher; $G_PUBLISH->AddContent('view', 'cases/cases_Load'); G::RenderPage('publish'); diff --git a/workflow/engine/methods/cases/main_init.php b/workflow/engine/methods/cases/main_init.php index 0b56964bf..a6e3ac75f 100755 --- a/workflow/engine/methods/cases/main_init.php +++ b/workflow/engine/methods/cases/main_init.php @@ -49,6 +49,10 @@ $defaultOption = 'casesListExtJs'; $confDefaultOption = 'CASES_INBOX'; } + + if (isset($_GET['id'])) { + $defaultOption = '../cases/open?APP_UID='.$_GET['id'].'&DEL_INDEX='.$_GET['i']; //.'&action=todo'; + } $oHeadPublisher->assign( 'defaultOption', $defaultOption); // user menu permissions $oHeadPublisher->assign( '_nodeId', isset($confDefaultOption)?$confDefaultOption:'PM_USERS'); // user menu permissions diff --git a/workflow/engine/templates/cases/cases_Load.php b/workflow/engine/templates/cases/cases_Load.php index 90b388be0..b6cc8c499 100755 --- a/workflow/engine/templates/cases/cases_Load.php +++ b/workflow/engine/templates/cases/cases_Load.php @@ -8,7 +8,7 @@ } - diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index bd9a83b63..c2a92dbad 100755 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -235,18 +235,24 @@ Ext.onReady(function(){ var loader = treeMenuItems.getLoader(); loader.on("load", function(){ document.getElementById('casesSubFrame').src = defaultOption; + + // check if a case was open directly + if (defaultOption.indexOf('open') > -1) { + //if it is, then update cases tree + updateCasesTree(); + } - if( _nodeId != '' ){ - treePanel1 = Ext.getCmp('tree-panel') - if(treePanel1) - node = treePanel1.getNodeById(_nodeId); - if(node) { - node.select(); - if (_nodeId == 'CASES_START_CASE') { - updateCasesTree(); - } + if( _nodeId != '' ){ + treePanel1 = Ext.getCmp('tree-panel') + if(treePanel1) + node = treePanel1.getNodeById(_nodeId); + if(node) { + node.select(); + if (_nodeId == 'CASES_START_CASE') { + updateCasesTree(); } } + } });