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

fixed merge issue

Browse Source
This commit is contained in:
Timo 2021-04-27 21:55:16 +03:00
parent 16db6eb017
commit b5d0f60046
2 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
View File

@ -1,61 +1,5 @@
<div class="menu flex-2 visible-lg breadcrumbs-container">
<<<<<<< HEAD
<a class="breadcrumb" [routerLink]="'/main/admin/project-templates'" translate="project-templates" *ngIf="root || !!appStateService.activeRuleSet"></a>
=======
<a
class="breadcrumb"
[routerLink]="'/main/admin/project-templates'"
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="project-templates"
*ngIf="(root || !!appStateService.activeRuleSet) && permissionService.isAdmin()"
></a>
<a
class="breadcrumb"
[routerLink]="'/main/admin/digital-signature'"
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="digital-signature"
*ngIf="root && permissionService.isAdmin()"
></a>
<a
class="breadcrumb"
[routerLink]="'/main/admin/license-info'"
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="license-information"
*ngIf="root && permissionService.isAdmin()"
></a>
<a
class="breadcrumb"
[routerLink]="'/main/admin/audit'"
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="audit"
*ngIf="root && permissionService.isAdmin()"
></a>
<a
class="breadcrumb"
[routerLink]="'/main/admin/users'"
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="user-management"
*ngIf="root && permissionService.canManageUsers()"
></a>
<a
class="breadcrumb"
[routerLink]="'/main/admin/smtp-config'"
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="configurations"
*ngIf="root && permissionService.isAdmin()"
></a>
>>>>>>> 6989f642 (admin breadcrumbs fix)
<ng-container *ngIf="appStateService.activeRuleSet">
<mat-icon svgIcon="red:arrow-right"></mat-icon>

2
apps/red-ui/src/app/services/user.service.ts
View File

@ -89,7 +89,7 @@ export class UserService {
}
async loadAllUsers() {
const allUsers = await this._userControllerService.getUsers({}, 0, 100).toPromise();
const allUsers = await this._userControllerService.getUsers({ requestId: 'users' }, 0, 100).toPromise();
this._allUsers = allUsers.users.filter((u) => this._hasAnyRedRole(u));
return allUsers;
}