Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-6880' into 'master'

Browse Source 
RED-6880: fixed infinite loading.

See merge request redactmanager/red-ui!307
This commit is contained in:
Dan Percic 2024-02-15 13:11:40 +01:00
commit 8f94cfb6b6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/red-ui/src/app/users/red-role.guard.ts
View File

@ -23,8 +23,14 @@ export class RedRoleGuard extends IqserRoleGuard {
return false;
}
// we have at least 1 RED Role -> if it's not user he must be an admin
if (currentUser.isUserAdmin && !currentUser.isAdmin && state.url.includes('admin') && !state.url.includes('users')) {
// we have at least 1 RED Role -> if it's not user he must be an admin or a manager
if (
currentUser.isUserAdmin &&
!currentUser.isManager &&
!currentUser.isAdmin &&
state.url.includes('admin') &&
!state.url.includes('users')
) {
this._logger.warn('[GUARD] Redirect to users page');
await this._router.navigate(['/main/admin/users']);
return false;