BUG 8668 No se puede remover permisos del rol PROCESSMAKER_ADMIN SOLVED

- The permits can not be removed for the role processmaker_admin.
- We add a generic list of permissions for the role processmaker_admin located in class.rbac.php.
- Was can remove permissions for the role processmaker_admin but other than those predefined in the list of RBAC.
This commit is contained in:
Marco Antonio Nina
2012-10-02 16:22:51 -04:00
parent 963c70b62c
commit c07a78e9ea
3 changed files with 8 additions and 9 deletions

View File

@@ -59,7 +59,6 @@ class RBAC
var $currentSystemobj; var $currentSystemobj;
var $rolesPermissionsObj; var $rolesPermissionsObj;
var $authSourcesObj; var $authSourcesObj;
var $permissionsAdmin;
var $aUserInfo = array(); var $aUserInfo = array();
var $aRbacPlugins = array(); var $aRbacPlugins = array();

View File

@@ -61,10 +61,8 @@ $roles['ROL_UID'] = $_GET['rUID'];
$roles['ROL_CODE'] = $RBAC->getRoleCode($_GET['rUID']); $roles['ROL_CODE'] = $RBAC->getRoleCode($_GET['rUID']);
$roles['CURRENT_TAB'] = ($_GET['tab']=='permissions') ? 1 : 0; $roles['CURRENT_TAB'] = ($_GET['tab']=='permissions') ? 1 : 0;
$permissionsAdmin = $RBAC->loadPermissionAdmin();
$oHeadPublisher->assign('ROLES', $roles); $oHeadPublisher->assign('ROLES', $roles);
$oHeadPublisher->assign('permissionsAdmin', $permissionsAdmin); $oHeadPublisher->assign('permissionsAdmin', $RBAC->loadPermissionAdmin());
G::RenderPage('publish', 'extJs'); G::RenderPage('publish', 'extJs');
?> ?>

View File

@@ -157,7 +157,7 @@ Ext.onReady(function(){
if (ROLES.ROL_UID == pm_admin) { if (ROLES.ROL_UID == pm_admin) {
var permissionUid = assignedGrid.getSelectionModel().getSelections(); var permissionUid = assignedGrid.getSelectionModel().getSelections();
permissionUid = permissionUid[0].get('PER_UID'); permissionUid = permissionUid[0].get('PER_UID');
for (i=0; i<permissionsAdmin.length; i++) for (var i=0; i<permissionsAdmin.length; i++)
{ {
if (permissionUid == permissionsAdmin[i]['PER_UID']) { if (permissionUid == permissionsAdmin[i]['PER_UID']) {
Ext.getCmp('removeButton').disable(); Ext.getCmp('removeButton').disable();
@@ -674,10 +674,11 @@ AssignPermissionAction = function(){
RemovePermissionAction = function(){ RemovePermissionAction = function(){
rowsSelected = assignedGrid.getSelectionModel().getSelections(); rowsSelected = assignedGrid.getSelectionModel().getSelections();
var arrAux = new Array(); var arrAux = new Array();
var sw;
for(var a=0; a < rowsSelected.length; a++){ for(var a=0; a < rowsSelected.length; a++){
var sw = true; sw = true;
if (ROLES.ROL_UID == pm_admin) { if (ROLES.ROL_UID == pm_admin) {
for (i=0; i<permissionsAdmin.length; i++) for (var i=0; i<permissionsAdmin.length; i++)
{ {
if (permissionsAdmin[i]['PER_UID'] == rowsSelected[a].get('PER_UID')) { if (permissionsAdmin[i]['PER_UID'] == rowsSelected[a].get('PER_UID')) {
sw = false; sw = false;
@@ -710,11 +711,12 @@ RemoveAllPermissionsAction = function(){
var allRows = assignedGrid.getStore(); var allRows = assignedGrid.getStore();
var arrAux = new Array(); var arrAux = new Array();
if (allRows.getCount()>0){ if (allRows.getCount()>0){
var sw;
for (var r=0; r < allRows.getCount(); r++){ for (var r=0; r < allRows.getCount(); r++){
row = allRows.getAt(r); row = allRows.getAt(r);
var sw = true; sw = true;
if (ROLES.ROL_UID == pm_admin) { if (ROLES.ROL_UID == pm_admin) {
for (i=0; i<permissionsAdmin.length; i++) for (var i=0; i<permissionsAdmin.length; i++)
{ {
if (permissionsAdmin[i]['PER_UID'] == row.data['PER_UID']) { if (permissionsAdmin[i]['PER_UID'] == row.data['PER_UID']) {
sw = false; sw = false;