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

PMCORE-4092

Browse Source
This commit is contained in:
Luciana Nuñez
2022-12-19 13:19:36 -04:00
parent c224d497f6
commit b61e727203
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -915,12 +915,16 @@ AssignPermissionAction = function(){
* @returns {void}
*/
RemovePermissionAction = function () {
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;
}
rowsSelected = assignedGrid.getSelectionModel().getSelections();
}
}
var arrAux = new Array();
var sw;
for (var a = 0; a < rowsSelected.length; a++) {