From dcf855731a72a6a55fcc2acc475eb04ed101f4d4 Mon Sep 17 00:00:00 2001 From: Fabio Guachalla Date: Tue, 29 Nov 2022 11:45:59 -0400 Subject: [PATCH 1/3] PMCORE-2332:[21963]Grid Sum Function Displays Wrong Decimal --- workflow/engine/templates/cases/pmdynaform.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflow/engine/templates/cases/pmdynaform.html b/workflow/engine/templates/cases/pmdynaform.html index 03f7151c5..0e15e6b39 100644 --- a/workflow/engine/templates/cases/pmdynaform.html +++ b/workflow/engine/templates/cases/pmdynaform.html @@ -26,6 +26,10 @@ + + From c36dcb875a4732c51af3a528ad070abef30df26c Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Mon, 19 Dec 2022 11:15:33 -0400 Subject: [PATCH 2/3] PMCORE-4056 --- .../engine/methods/login/forgotPassword.php | 47 +++++++------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/workflow/engine/methods/login/forgotPassword.php b/workflow/engine/methods/login/forgotPassword.php index 416bf7e5e..745e042ea 100644 --- a/workflow/engine/methods/login/forgotPassword.php +++ b/workflow/engine/methods/login/forgotPassword.php @@ -1,34 +1,21 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * */ -$G_PUBLISH = new Publisher (); -$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION'))); -$version = isset($version[0]) ? intval($version[0]) : 0; -if ($version >= 3) { - $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php'); -}else{ - $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); -} -G::RenderPage ( "publish" ); - +$conf = new Configurations(); +$conf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', ''); +if (isset($conf->aConfig["login_enableForgotPassword"]) && $conf->aConfig["login_enableForgotPassword"] == "1") { + $G_PUBLISH = new Publisher(); + $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION'))); + $version = isset($version[0]) ? intval($version[0]) : 0; + if ($version >= 3) { + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php'); + } else { + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); + } + G::RenderPage("publish"); +} else { + G::header('Location: /errors/error403.php'); + die(); +} From b61e727203aa8e76e5755c343682ec2e7b7314b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luciana=20Nu=C3=B1ez?= Date: Mon, 19 Dec 2022 13:19:36 -0400 Subject: [PATCH 3/3] PMCORE-4092 --- .../engine/methods/roles/data_rolesPermissions.php | 12 +++++++++--- .../engine/templates/roles/rolesUsersPermission.js | 14 +++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/workflow/engine/methods/roles/data_rolesPermissions.php b/workflow/engine/methods/roles/data_rolesPermissions.php index b4f1c71eb..aa6ce4d34 100644 --- a/workflow/engine/methods/roles/data_rolesPermissions.php +++ b/workflow/engine/methods/roles/data_rolesPermissions.php @@ -24,11 +24,17 @@ if ($TYPE_DATA == 'show') { } $rows = []; -$per = new RolesPermissions(); +$rolesPermissions = new RolesPermissions(); +$permissionsAdmin = $RBAC->loadPermissionAdmin(); + while ($oDataset->next()) { $row = $oDataset->getRow(); - $per->setPerUid($row['PER_UID']); - $row['PER_NAME'] = $per->getPermissionName(); + $rolesPermissions->setPerUid($row['PER_UID']); + // Get permission name + $row['PER_NAME'] = $rolesPermissions->getPermissionName(); + // Define permission type + $row['TYPE'] = array_search($row['PER_UID'], array_column($permissionsAdmin, 'PER_UID')) !== false ? 'ADMIN' : 'CUSTOM'; + $rows[] = $row; } diff --git a/workflow/engine/templates/roles/rolesUsersPermission.js b/workflow/engine/templates/roles/rolesUsersPermission.js index 647789599..d24d3a4fc 100644 --- a/workflow/engine/templates/roles/rolesUsersPermission.js +++ b/workflow/engine/templates/roles/rolesUsersPermission.js @@ -915,12 +915,16 @@ AssignPermissionAction = function(){ * @returns {void} */ RemovePermissionAction = function () { - if (ROLES.ROL_UID === pm_admin) { - var message = _('ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE'); - Ext.Msg.alert(_('ID_INFORMATION'), message); - return; - } rowsSelected = assignedGrid.getSelectionModel().getSelections(); + for (var a = 0; a < rowsSelected.length; a++) { + if (ROLES.ROL_UID === pm_admin) { + if (rowsSelected[a].json.TYPE !== 'CUSTOM') { + var message = _('ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE'); + Ext.Msg.alert(_('ID_INFORMATION'), message); + return; + } + } + } var arrAux = new Array(); var sw; for (var a = 0; a < rowsSelected.length; a++) {