diff --git a/workflow/engine/menus/cases.php b/workflow/engine/menus/cases.php index 63d308dfd..9287eb7e1 100644 --- a/workflow/engine/menus/cases.php +++ b/workflow/engine/menus/cases.php @@ -58,9 +58,10 @@ $G_TMP_MENU->AddIdRawOption('CASES_TO_REASSIGN', 'casesListExtJs?action=to_reassign', G::LoadTranslation('ID_TO_REASSIGN'), 'reassing.png' ); } - $G_TMP_MENU->AddIdRawOption('CASES_HOME', 'casesStartPage', G::LoadTranslation('ID_EXTENDED_FEATURES'), '', '', 'blockHeader'); + $G_TMP_MENU->AddIdRawOption('CASES_FOLDERS', 'casesStartPage?action=documents', G::LoadTranslation('ID_FOLDERS'), 'folderV2.gif','','blockHeaderNoChild' ); + $G_TMP_MENU->AddIdRawOption('PLUGINS', '', G::LoadTranslation('ID_PLUGINS'), '', '', 'blockHeader'); + - $G_TMP_MENU->AddIdRawOption('CASES_FOLDERS', 'casesStartPage?action=documents', G::LoadTranslation('ID_FOLDERS'), 'folderV2.gif' ); //$G_TMP_MENU->AddIdRawOption('CASES_START_PAGE', 'casesStartPage?action=mainDashboard', ucwords(strtolower(G::LoadTranslation('ID_DASHBOARD'))), '' ); //Load Other registered Dashboards (From plugins) diff --git a/workflow/engine/methods/cases/casesMenuLoader.php b/workflow/engine/methods/cases/casesMenuLoader.php index 6c19e9be3..94770d298 100644 --- a/workflow/engine/methods/cases/casesMenuLoader.php +++ b/workflow/engine/methods/cases/casesMenuLoader.php @@ -74,8 +74,11 @@ $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i]; $menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i]; $menuCases[$CurrentBlockID]['loaderurl'] = $oMenu->Options[$i]; - - + }elseif( $oMenu->Types[$i] == 'blockHeaderNoChild' ){ + $CurrentBlockID = $oMenu->Id[$i]; + $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i]; + $menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i]; + $menuCases[$CurrentBlockID]['link'] = $oMenu->Options[$i]; }else { $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = Array ( 'label' => $oMenu->Labels[$i], @@ -113,6 +116,10 @@ }elseif( isset($aMenuBlock['blockType']) && $aMenuBlock['blockType']=="blockNestedTree" ) { $xml .= ''; $xml .= ''; + }elseif( isset($aMenuBlock['blockType']) && $aMenuBlock['blockType']=="blockHeaderNoChild" ) { + $xml .= ''; + //$xml .= ''; + $xml .= ''; } } $xml .= ''; diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index b9d830a57..0316b6cd5 100755 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -642,7 +642,7 @@ Ext.extend(Ext.data.DynamicJsonReader, Ext.data.JsonReader, { Ext.app.menuLoader = Ext.extend(Ext.ux.tree.XmlTreeLoader, { processAttributes : function(attr){ - + //console.log(attr); if(attr.blockNestedTree){ //console.log(attr); attr.text = attr.blockTitle; @@ -670,7 +670,18 @@ Ext.app.menuLoader = Ext.extend(Ext.ux.tree.XmlTreeLoader, { }; - }else if(attr.blockTitle){ + }else if(attr.blockHeaderNoChild){ + //console.info(attr); + attr.text = attr.blockTitle; + attr.iconCls = 'ICON_' + attr.id; + attr.loaded = true; + attr.expanded = false; + //attr.disabled=true; + attr.expandable=true; + attr.qtip=attr.blockTitle; + + + }else if(attr.blockTitle){ attr.text = attr.blockTitle; attr.iconCls = 'ICON_' + attr.id; attr.loaded = true;