From 689bfcac616d8803ea9ecdbf6cd8fde259c16288 Mon Sep 17 00:00:00 2001
From: Jochen Winzer <jw@winzer-sw.de>
Date: Fri, 6 Nov 2020 11:32:54 +0100
Subject: [PATCH] Fix unresolved permissions.

---
 .../components/motion-list/motion-list.component.html         | 2 +-
 .../app/site/motions/services/local-permissions.service.ts    | 3 +++
 .../site/users/components/user-list/user-list.component.html  | 2 +-
 .../site/users/components/user-list/user-list.component.ts    | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
index 0af8599ee..66791123f 100644
--- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
+++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
@@ -263,7 +263,7 @@
 
         <mat-divider
             *ngIf="(categories.length || motionBlocks.length || hasAmendments() || perms.isAllowed('manage'))
-            && (perms.isAllowed('manage') || selectedView === 'list' || operator.hasPerms('core.can_manage_config'))"
+            && (perms.isAllowed('manage') || selectedView === 'list' || perms.isAllowed('can_manage_config'))"
         ></mat-divider>
 
         <div *ngIf="perms.isAllowed('manage')">
diff --git a/client/src/app/site/motions/services/local-permissions.service.ts b/client/src/app/site/motions/services/local-permissions.service.ts
index 64c277929..14e93ca71 100644
--- a/client/src/app/site/motions/services/local-permissions.service.ts
+++ b/client/src/app/site/motions/services/local-permissions.service.ts
@@ -166,6 +166,9 @@ export class LocalPermissionsService {
                     this.operator.hasPerms(Permission.motionsCanManageMetadata)
                 );
             }
+            case 'can_manage_config': {
+                return this.operator.hasPerms(Permission.coreCanManageConfig);
+            }
             case 'manage': {
                 return this.operator.hasPerms(Permission.motionsCanManage);
             }
diff --git a/client/src/app/site/users/components/user-list/user-list.component.html b/client/src/app/site/users/components/user-list/user-list.component.html
index f3dd1edac..d1bfc0de0 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.html
+++ b/client/src/app/site/users/components/user-list/user-list.component.html
@@ -50,7 +50,7 @@
                 </mat-icon>
                 <mat-icon
                     matTooltip="{{ 'Inactive' | translate }}"
-                    *ngIf="!user.is_active && this.operator.hasPerms('users.see_extra')"
+                    *ngIf="!user.is_active && canSeeExtra"
                 >
                     block
                 </mat-icon>
diff --git a/client/src/app/site/users/components/user-list/user-list.component.ts b/client/src/app/site/users/components/user-list/user-list.component.ts
index ff9befaec..9f0db25d9 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.ts
+++ b/client/src/app/site/users/components/user-list/user-list.component.ts
@@ -118,6 +118,10 @@ export class UserListComponent extends BaseListViewComponent<ViewUser> implement
         return this.operator.hasPerms(Permission.usersCanManage);
     }
 
+    public get canSeeExtra(): boolean {
+        return this.operator.hasPerms(Permission.usersCanSeeExtraData);
+    }
+
     public get showVoteWeight(): boolean {
         return this.pollService.isElectronicVotingEnabled && this.isVoteWeightActive;
     }