From b5d0f6004646641359864a0692c2b2cc37b5c883 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Tue, 27 Apr 2021 21:55:16 +0300
Subject: [PATCH] fixed merge issue

---
 .../admin-breadcrumbs.component.html          | 56 -------------------
 apps/red-ui/src/app/services/user.service.ts  |  2 +-
 2 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
index 17f866879..0d36682a3 100644
--- a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
+++ b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
@@ -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>
diff --git a/apps/red-ui/src/app/services/user.service.ts b/apps/red-ui/src/app/services/user.service.ts
index 026e78f18..b72f7c44b 100644
--- a/apps/red-ui/src/app/services/user.service.ts
+++ b/apps/red-ui/src/app/services/user.service.ts
@@ -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;
     }