fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #344 from julceslauhub/master

Browse Source 
BUG 8444 Remove permission PM_REPORTS, since it no longer serves any purpose SOLVED
This commit is contained in:
julceslauhub
2012-07-19 08:15:02 -07:00
parent 668ae7365e 6dd48d4b00
commit 70cb77ec0f
3 changed files with 113 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulliver/system/class.rbac.php
View File

@@ -738,8 +738,8 @@ class RBAC
* @param string $ROL_UID
* @return $this->rolesObj->getRolePermissions
*/
function getRolePermissions($ROL_UID, $filter=''){
return $this->rolesObj->getRolePermissions($ROL_UID,$filter);
function getRolePermissions($ROL_UID, $filter='', $status=null){
return $this->rolesObj->getRolePermissions($ROL_UID, $filter, $status);
}
/**
@@ -752,8 +752,8 @@ class RBAC
* @param string $PER_SYSTEM
* @return $this->rolesObj->getAllPermissions
*/
function getAllPermissions($ROL_UID,$PER_SYSTEM="",$filter=''){
return $this->rolesObj->getAllPermissions($ROL_UID,$PER_SYSTEM,$filter);
function getAllPermissions($ROL_UID, $PER_SYSTEM="", $filter='', $status=null){
return $this->rolesObj->getAllPermissions($ROL_UID, $PER_SYSTEM, $filter, $status);
}
/**

206
rbac/engine/classes/model/Roles.php
View File

File diff suppressed because it is too large Load Diff

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

@@ -35,8 +35,8 @@ if ($RBAC->permissionsObj->loadByCode('PM_CANCELCASE') === false) {
$RBAC->permissionsObj->create(array('PER_CODE' => 'PM_CANCELCASE', 'PER_CREATE_DATE' => date('Y-m-d H:i:s')));
}
if ($TYPE_DATA=='list') $oDataset = $RBAC->getRolePermissions($ROL_UID,$filter);
if ($TYPE_DATA=='show') $oDataset = $RBAC->getAllPermissions($ROL_UID,$RBAC->sSystem,$filter);
if ($TYPE_DATA=='list') $oDataset = $RBAC->getRolePermissions($ROL_UID, $filter, 1);
if ($TYPE_DATA=='show') $oDataset = $RBAC->getAllPermissions($ROL_UID, $RBAC->sSystem, $filter, 1);
$rows = Array();
while($oDataset->next()){