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

Merged in release/3.8.1 (pull request #8676)

Browse Source 
Updating feature branch with the last commits in branch release/3.8.1
This commit is contained in:
Julio Cesar Laura Avendaño
2023-01-05 15:41:17 +00:00
parent c39deff8e4 9c97548fd0
commit c698a4e1f5
4 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
workflow/engine/methods/login/forgotPassword.php
View File

@@ -1,34 +1,21 @@
<?php <?php
/** /**
* forgotPassword.php * forgotPassword.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2011 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/ */
$G_PUBLISH = new Publisher (); $conf = new Configurations();
$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION'))); $conf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
$version = isset($version[0]) ? intval($version[0]) : 0; if (isset($conf->aConfig["login_enableForgotPassword"]) && $conf->aConfig["login_enableForgotPassword"] == "1") {
if ($version >= 3) { $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php'); $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
}else{ $version = isset($version[0]) ? intval($version[0]) : 0;
$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); 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();
} }
G::RenderPage ( "publish" );

12
workflow/engine/methods/roles/data_rolesPermissions.php
View File

@@ -24,11 +24,17 @@ if ($TYPE_DATA == 'show') {
} }
$rows = []; $rows = [];
$per = new RolesPermissions(); $rolesPermissions = new RolesPermissions();
$permissionsAdmin = $RBAC->loadPermissionAdmin();
while ($oDataset->next()) { while ($oDataset->next()) {
$row = $oDataset->getRow(); $row = $oDataset->getRow();
$per->setPerUid($row['PER_UID']); $rolesPermissions->setPerUid($row['PER_UID']);
$row['PER_NAME'] = $per->getPermissionName(); // 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; $rows[] = $row;
} }

4
workflow/engine/templates/cases/pmdynaform.html
View File

@@ -26,6 +26,10 @@
<script type="text/javascript" src="/lib/pmdynaform/libs/html5/html5.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/html5/html5.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-notify-3.1.3/bootstrap-notify.min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-notify-3.1.3/bootstrap-notify.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/decimal/decimal.js"></script>
<script type="module">
import Decimal from '/lib/pmdynaform/libs/decimal/decimal_m.js';
</script>
</head> </head>
<body style="height:100%"> <body style="height:100%">
<div id="container" style="height:100%;display:none;"></div> <div id="container" style="height:100%;display:none;"></div>

6
workflow/engine/templates/roles/rolesUsersPermission.js
View File

@@ -915,12 +915,16 @@ AssignPermissionAction = function(){
* @returns {void} * @returns {void}
*/ */
RemovePermissionAction = function () { RemovePermissionAction = function () {
rowsSelected = assignedGrid.getSelectionModel().getSelections();
for (var a = 0; a < rowsSelected.length; a++) {
if (ROLES.ROL_UID === pm_admin) { if (ROLES.ROL_UID === pm_admin) {
if (rowsSelected[a].json.TYPE !== 'CUSTOM') {
var message = _('ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE'); var message = _('ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE');
Ext.Msg.alert(_('ID_INFORMATION'), message); Ext.Msg.alert(_('ID_INFORMATION'), message);
return; return;
} }
rowsSelected = assignedGrid.getSelectionModel().getSelections(); }
}
var arrAux = new Array(); var arrAux = new Array();
var sw; var sw;
for (var a = 0; a < rowsSelected.length; a++) { for (var a = 0; a < rowsSelected.length; a++) {