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

Merge pull request #1780 from Jennydmz/BUG-11980

Browse Source 
Bug 11980 Change the Administrator User Role to Operator Role. SOLVED
This commit is contained in:
julceslauhub
2013-06-04 13:45:23 -07:00
parent 9bba933e46 cfd709e04b
commit 81ff08cedc
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/methods/roles/roles_Ajax.php
View File

@@ -162,6 +162,14 @@ switch ($REQUEST) {
foreach ($aUserIuds as $key => $val) { foreach ($aUserIuds as $key => $val) {
$sData['USR_UID'] = $val; $sData['USR_UID'] = $val;
$sData['ROL_UID'] = $ROL_UID; $sData['ROL_UID'] = $ROL_UID;
if ($sData['USR_UID'] == '00000000000000000000000000000001') {
if ($sData['ROL_UID'] != 'PROCESSMAKER_ADMIN') {
$response = new stdclass();
$response->userRole = true;
echo G::json_encode($response);
break;
}
}
$RBAC->assignUserToRole( $sData ); $RBAC->assignUserToRole( $sData );
} }

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

@@ -753,7 +753,17 @@ SaveUsersRole = function(arr_usr, function_success, function_failure){
Ext.Ajax.request({ Ext.Ajax.request({
url: 'roles_Ajax', url: 'roles_Ajax',
params: {request: 'assignUserToRole', ROL_UID: ROLES.ROL_UID, aUsers: arr_usr.join(',')}, params: {request: 'assignUserToRole', ROL_UID: ROLES.ROL_UID, aUsers: arr_usr.join(',')},
success: function(){ success: function( result, request ){
var data = Ext.util.JSON.decode(result.responseText);
if( data.userRole ) {
Ext.Msg.show({
title: _('ID_WARNING'),
msg: _('ID_ADMINISTRATOR_ROLE_CANT_CHANGED'),
animEl: 'elId',
icon: Ext.MessageBox.WARNING,
buttons: Ext.MessageBox.OK
});
}
viewport.getEl().unmask(); viewport.getEl().unmask();
function_success(); function_success();
}, },