diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php index 629224ce5..ffa8f5007 100755 --- a/rbac/engine/classes/model/Roles.php +++ b/rbac/engine/classes/model/Roles.php @@ -168,10 +168,6 @@ class Roles extends BaseRoles { return $result; } - - - - function getAllRoles($systemCode = 'PROCESSMAKER') { $c = $this->listAllRoles($systemCode); $rs = RolesPeer::DoSelectRs($c); @@ -188,7 +184,6 @@ class Roles extends BaseRoles { return $aRows; } - function listAllPermissions($systemCode = 'PROCESSMAKER') { try { $oCriteria = new Criteria('rbac'); diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index b27a37566..4b42988f1 100644 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -97,7 +97,7 @@ switch ($_POST['action']) { $roles = new Roles(); $rolesData = $roles->getAllRoles(); foreach ($rolesData as $rowid => $row) { - $oData[] = array('ROL_UID' => $row['ROL_CODE'], 'ROL_CODE' => $row['ROL_CODE']); + $oData[] = array('ROL_UID' => $row['ROL_CODE'], 'ROL_CODE' => $row['ROL_NAME']); } print (G::json_encode($oData)); break; @@ -613,4 +613,3 @@ switch ($_POST['action']) { echo G::json_encode($response); break; } - \ No newline at end of file