fix roles after change the role name to Lurana
This commit is contained in:
@@ -10,7 +10,7 @@ class RBAC
|
|||||||
const PER_SYSTEM = '00000000000000000000000000000002';
|
const PER_SYSTEM = '00000000000000000000000000000002';
|
||||||
const PM_GUEST_CASE = 'PM_GUEST_CASE';
|
const PM_GUEST_CASE = 'PM_GUEST_CASE';
|
||||||
const PM_GUEST_CASE_UID = '00000000000000000000000000000066';
|
const PM_GUEST_CASE_UID = '00000000000000000000000000000066';
|
||||||
const PROCESSMAKER_GUEST = 'PROCESSMAKER_GUEST';
|
const PROCESSMAKER_GUEST = 'LURANA_GUEST';
|
||||||
const PROCESSMAKER_GUEST_UID = '00000000000000000000000000000005';
|
const PROCESSMAKER_GUEST_UID = '00000000000000000000000000000005';
|
||||||
const GUEST_USER_UID = '00000000000000000000000000000002';
|
const GUEST_USER_UID = '00000000000000000000000000000002';
|
||||||
public static $defaultPermissionsForAdmin = ['PM_TASK_SCHEDULER_ADMIN'];
|
public static $defaultPermissionsForAdmin = ['PM_TASK_SCHEDULER_ADMIN'];
|
||||||
|
|||||||
@@ -118,8 +118,8 @@ class Roles extends BaseRoles
|
|||||||
$criteria->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
|
$criteria->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
|
||||||
$criteria->add(RolesPeer::ROL_CODE, RBAC::PROCESSMAKER_GUEST, Criteria::NOT_EQUAL);
|
$criteria->add(RolesPeer::ROL_CODE, RBAC::PROCESSMAKER_GUEST, Criteria::NOT_EQUAL);
|
||||||
$criteria->add(SystemsPeer::SYS_CODE, $systemCode);
|
$criteria->add(SystemsPeer::SYS_CODE, $systemCode);
|
||||||
$criteria->add(RolesPeer::ROL_CREATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
|
#$criteria->add(RolesPeer::ROL_CREATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
|
||||||
$criteria->add(RolesPeer::ROL_UPDATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
|
#$criteria->add(RolesPeer::ROL_UPDATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
|
||||||
|
|
||||||
if (!empty($filter)) {
|
if (!empty($filter)) {
|
||||||
$criteria->add(RolesPeer::ROL_CODE, '%' . $filter . '%', Criteria::LIKE);
|
$criteria->add(RolesPeer::ROL_CODE, '%' . $filter . '%', Criteria::LIKE);
|
||||||
@@ -195,6 +195,7 @@ class Roles extends BaseRoles
|
|||||||
$rows = [];
|
$rows = [];
|
||||||
while ($rs->next()) {
|
while ($rs->next()) {
|
||||||
$row = $rs->getRow();
|
$row = $rs->getRow();
|
||||||
|
|
||||||
$o = new Roles();
|
$o = new Roles();
|
||||||
$o->load($row['ROL_UID']);
|
$o->load($row['ROL_UID']);
|
||||||
$row['ROL_NAME'] = $o->getRolName();
|
$row['ROL_NAME'] = $o->getRolName();
|
||||||
|
|||||||
@@ -323,4 +323,3 @@ switch ($REQUEST) {
|
|||||||
default:
|
default:
|
||||||
echo 'default';
|
echo 'default';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ try {
|
|||||||
case 'rolesList':
|
case 'rolesList':
|
||||||
$roles = new Roles();
|
$roles = new Roles();
|
||||||
$rolesData = $roles->getAllRoles();
|
$rolesData = $roles->getAllRoles();
|
||||||
|
|
||||||
$data = [];
|
$data = [];
|
||||||
foreach ($rolesData as $rowId => $row) {
|
foreach ($rolesData as $rowId => $row) {
|
||||||
$data[] = ['ROL_UID' => $row['ROL_CODE'], 'ROL_CODE' => $row['ROL_NAME']];
|
$data[] = ['ROL_UID' => $row['ROL_CODE'], 'ROL_CODE' => $row['ROL_NAME']];
|
||||||
|
|||||||
@@ -678,7 +678,7 @@ class Role
|
|||||||
->where('CONTENT.CON_CATEGORY', '=', 'ROL_NAME')
|
->where('CONTENT.CON_CATEGORY', '=', 'ROL_NAME')
|
||||||
->where('CONTENT.CON_LANG', '=', $lang)
|
->where('CONTENT.CON_LANG', '=', $lang)
|
||||||
->where('RBAC_ROLES.ROL_CODE', '<>', 'RBAC_ADMIN')
|
->where('RBAC_ROLES.ROL_CODE', '<>', 'RBAC_ADMIN')
|
||||||
->where('RBAC_ROLES.ROL_CODE', '<>', 'PROCESSMAKER_GUEST')
|
->where('RBAC_ROLES.ROL_CODE', '<>', 'LURANA_GUEST')
|
||||||
->where('RBAC_ROLES.ROL_STATUS', '=', '1')
|
->where('RBAC_ROLES.ROL_STATUS', '=', '1')
|
||||||
->select([
|
->select([
|
||||||
'RBAC_ROLES.ROL_UID',
|
'RBAC_ROLES.ROL_UID',
|
||||||
@@ -691,4 +691,3 @@ class Role
|
|||||||
return $roles;
|
return $roles;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user