From 837044309994c37abc1d30d0eed63b74d37ee600 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 5 Nov 2019 11:04:05 +0100
Subject: [PATCH] FEAT #12003 TIME 0:05 fix current user shortcuts
---
src/frontend/app/menu/menu-shortcut.component.ts | 2 +-
src/frontend/service/privileges.service.ts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/frontend/app/menu/menu-shortcut.component.ts b/src/frontend/app/menu/menu-shortcut.component.ts
index 192bfcc762a..fb0049f1dcb 100755
--- a/src/frontend/app/menu/menu-shortcut.component.ts
+++ b/src/frontend/app/menu/menu-shortcut.component.ts
@@ -37,7 +37,7 @@ export class MenuShortcutComponent implements OnInit {
}
ngOnInit(): void {
- this.shortcuts = this.privilegeService.getShortcuts();
+ this.shortcuts = this.privilegeService.getCurrentUserShortcuts();
}
onSpeedDialFabClicked(group: any, shortcut:any) {
diff --git a/src/frontend/service/privileges.service.ts b/src/frontend/service/privileges.service.ts
index 29832084177..43ef063372e 100644
--- a/src/frontend/service/privileges.service.ts
+++ b/src/frontend/service/privileges.service.ts
@@ -487,7 +487,7 @@ export class PrivilegeService {
return this.menus.map(elem => elem.unit).filter((elem, pos, arr) => arr.indexOf(elem) === pos);
}
- getShortcuts(): Array<menu> {
+ getCurrentUserShortcuts(): Array<menu> {
let shortcuts: any[] = [
{
"id": "home",
@@ -501,7 +501,7 @@ export class PrivilegeService {
}
];
- shortcuts = shortcuts.concat(this.menus.filter(elem => elem.shortcut === true));
+ shortcuts = shortcuts.concat(this.menus.filter(elem => elem.shortcut === true).filter(elem => this.headerService.user.privileges.indexOf(elem.id) > -1));
if (this.headerService.user.groups.filter((group: any) => group.can_index === true).length > 0) {
const indexingGroups: any[] = [];
--
GitLab