diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index 3c8d4a5b3..016169c91 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -194,6 +194,7 @@ if ($RBAC->userCanAccess('PM_USERS') === 1) { '', 'users' ); + /*----------------------------------********---------------------------------*/ $G_TMP_MENU->AddIdRawOption( 'USERS_EXTENDED', '../userExtendedAttributes/index', @@ -202,6 +203,7 @@ if ($RBAC->userCanAccess('PM_USERS') === 1) { '', 'users' ); + /*----------------------------------********---------------------------------*/ $G_TMP_MENU->AddIdRawOption( 'GROUPS', '../groups/groups', diff --git a/workflow/engine/templates/cases/cases_Load.php b/workflow/engine/templates/cases/cases_Load.php index 59f382be0..4fcca1b52 100644 --- a/workflow/engine/templates/cases/cases_Load.php +++ b/workflow/engine/templates/cases/cases_Load.php @@ -1,80 +1,61 @@ - - - - - - - - - - - + containerList1 = document.getElementById("pm_header"); + if (document.getElementById("mainMenuBG") && + document.getElementById("mainMenuBG").parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode) { + containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode; + } + if (containerList1 === containerList2) { + height = oClientWinSize.height - containerList1.clientHeight; + oCasesFrame.style.height = height; + if (oCasesFrame.height) { + oCasesFrame.height = height; + } + } else { + height = getClientWindowSize().height - 90; + oCasesFrame.style.height = height + 'px'; + oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); + if (oCasesSubFrame) { + oCasesSubFrame.style.height = (height - 5) + 'px'; + } else { + setTimeout('autoResizeScreen()', 2000); + } + } + } + + + \ No newline at end of file