BUG 11021: Change the role names from PROCESSMAKER_XXXX to only "XXXX"
Only change the label dropdown for new Users Role
This commit is contained in:
@@ -168,10 +168,6 @@ class Roles extends BaseRoles {
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function getAllRoles($systemCode = 'PROCESSMAKER') {
|
function getAllRoles($systemCode = 'PROCESSMAKER') {
|
||||||
$c = $this->listAllRoles($systemCode);
|
$c = $this->listAllRoles($systemCode);
|
||||||
$rs = RolesPeer::DoSelectRs($c);
|
$rs = RolesPeer::DoSelectRs($c);
|
||||||
@@ -188,7 +184,6 @@ class Roles extends BaseRoles {
|
|||||||
return $aRows;
|
return $aRows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function listAllPermissions($systemCode = 'PROCESSMAKER') {
|
function listAllPermissions($systemCode = 'PROCESSMAKER') {
|
||||||
try {
|
try {
|
||||||
$oCriteria = new Criteria('rbac');
|
$oCriteria = new Criteria('rbac');
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ switch ($_POST['action']) {
|
|||||||
$roles = new Roles();
|
$roles = new Roles();
|
||||||
$rolesData = $roles->getAllRoles();
|
$rolesData = $roles->getAllRoles();
|
||||||
foreach ($rolesData as $rowid => $row) {
|
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));
|
print (G::json_encode($oData));
|
||||||
break;
|
break;
|
||||||
@@ -613,4 +613,3 @@ switch ($_POST['action']) {
|
|||||||
echo G::json_encode($response);
|
echo G::json_encode($response);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user