fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-2827 3.6.0 Community > New UI does not work correctly

Browse Source
This commit is contained in:
Roly Gutierrez
2022-01-10 12:37:00 -04:00
parent d3300eef12
commit a196348bdc
2 changed files with 53 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/menus/setup.php
View File

@@ -194,6 +194,7 @@ if ($RBAC->userCanAccess('PM_USERS') === 1) {
'', '',
'users' 'users'
); );
/*----------------------------------********---------------------------------*/
$G_TMP_MENU->AddIdRawOption( $G_TMP_MENU->AddIdRawOption(
'USERS_EXTENDED', 'USERS_EXTENDED',
'../userExtendedAttributes/index', '../userExtendedAttributes/index',
@@ -202,6 +203,7 @@ if ($RBAC->userCanAccess('PM_USERS') === 1) {
'', '',
'users' 'users'
); );
/*----------------------------------********---------------------------------*/
$G_TMP_MENU->AddIdRawOption( $G_TMP_MENU->AddIdRawOption(
'GROUPS', 'GROUPS',
'../groups/groups', '../groups/groups',

37
workflow/engine/templates/cases/cases_Load.php
View File

@@ -1,5 +1,5 @@
<?php <?php
$cd = (isset($_SESSION['__CD__']))? $_SESSION['__CD__'] : ''; $cd = (isset($_SESSION['__CD__'])) ? $_SESSION['__CD__'] : '';
unset($_SESSION['__CD__']); unset($_SESSION['__CD__']);
$filter = new InputFilter(); $filter = new InputFilter();
@@ -14,36 +14,17 @@ $filter = new InputFilter();
} }
</style> </style>
<body onresize="autoResizeScreen()" onload="autoResizeScreen()"> <body onresize="autoResizeScreen()" onload="autoResizeScreen()">
<?php
/*----------------------------------********---------------------------------*/
if (true) {
//In enterprise version this snippet of code should be always be executed
//In community version this snippet of code is deleted and is executed the next snippet of code
?>
<iframe name="casesFrame" id="casesFrame" src ="<?php echo $cd; ?>../cases/viena_init<?php echo $filter->xssFilterHard($_POST['qs']); ?>" width="99%" height="768" frameborder="0"> <iframe name="casesFrame" id="casesFrame" src ="<?php echo $cd; ?>../cases/viena_init<?php echo $filter->xssFilterHard($_POST['qs']); ?>" width="99%" height="768" frameborder="0">
<p>Your browser does not support iframes.</p> <p>Your browser does not support iframes.</p>
</iframe> </iframe>
<?php
} else {
/*----------------------------------********---------------------------------*/
?>
<iframe name="casesFrame" id="casesFrame" src ="<?php echo $cd; ?>../cases/main_init<?php echo $filter->xssFilterHard($_POST['qs']); ?>" width="99%" height="768" frameborder="0">
<p>Your browser does not support iframes.</p>
</iframe>
<?php
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
?>
</body> </body>
<script> <script>
if ( document.getElementById('pm_submenu') ) if (document.getElementById('pm_submenu'))
document.getElementById('pm_submenu').style.display = 'none'; document.getElementById('pm_submenu').style.display = 'none';
document.documentElement.style.overflowY = 'hidden'; document.documentElement.style.overflowY = 'hidden';
var oClientWinSize = getClientWindowSize(); var oClientWinSize = getClientWindowSize();
function autoResizeScreen() { function autoResizeScreen() {
var containerList1, containerList2; var containerList1, containerList2;
oCasesFrame = document.getElementById('casesFrame'); oCasesFrame = document.getElementById('casesFrame');
@@ -54,27 +35,27 @@ if (true) {
document.getElementById("mainMenuBG").parentNode && document.getElementById("mainMenuBG").parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode && document.getElementById("mainMenuBG").parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode && document.getElementById("mainMenuBG").parentNode.parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode){ document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode) {
containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode; containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode;
} }
if (containerList1 === containerList2) { if (containerList1 === containerList2) {
height = oClientWinSize.height - containerList1.clientHeight; height = oClientWinSize.height - containerList1.clientHeight;
oCasesFrame.style.height = height; oCasesFrame.style.height = height;
if (oCasesFrame.height ) { if (oCasesFrame.height) {
oCasesFrame.height = height; oCasesFrame.height = height;
} }
} else { } else {
height = getClientWindowSize().height-90; height = getClientWindowSize().height - 90;
oCasesFrame.style.height = height + 'px'; oCasesFrame.style.height = height + 'px';
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
if(oCasesSubFrame){ if (oCasesSubFrame) {
oCasesSubFrame.style.height = (height-5) + 'px';; oCasesSubFrame.style.height = (height - 5) + 'px';
} else { } else {
setTimeout('autoResizeScreen()', 2000); setTimeout('autoResizeScreen()', 2000);
} }
} }
} }
</script> </script>
<SCRIPT src="/jscore/src/PM.js" type=text/javascript></SCRIPT> <script src="/jscore/src/PM.js" type=text/javascript></script>
<SCRIPT src="/jscore/src/Sessions.js" type=text/javascript></SCRIPT> <script src="/jscore/src/Sessions.js" type=text/javascript></script>
</html> </html>