From 7e9190ea8476e552879c2672a2e9b8ed5cc43d94 Mon Sep 17 00:00:00 2001
From: GabrielMeyer <meyergabriel@live.de>
Date: Fri, 5 Jul 2019 16:35:32 +0200
Subject: [PATCH] Corrects the permission-handling

- Projector-controls aren't seen, if no permission 'can_manage'
- The 'more options'-menu is removed
- New config option: Hide amount of speakers in list of speakers slide subtitle.
---
 .../projector-detail.component.html           |  2 +-
 .../topic-detail/topic-detail.component.html  |  4 +--
 ...mmon-list-of-speakers-slide.component.html |  2 +-
 ...common-list-of-speakers-slide.component.ts | 26 ++++++++++++++++---
 openslides/agenda/config_variables.py         | 10 +++++++
 5 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
index 1296de599..66654506e 100644
--- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
+++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
@@ -13,7 +13,7 @@
             </div>
         </a>
         <!-- Controls under the projector preview -->
-        <div class="control-group projector-controls">
+        <div *osPerms="'core.can_manage_projector'" class="control-group projector-controls">
             <!-- scale up -->
             <button type="button" mat-icon-button (click)="scale(scrollScaleDirection.Up)">
                 <mat-icon>zoom_in</mat-icon>
diff --git a/client/src/app/site/topics/components/topic-detail/topic-detail.component.html b/client/src/app/site/topics/components/topic-detail/topic-detail.component.html
index 6a1929d3a..f70d22fa2 100644
--- a/client/src/app/site/topics/components/topic-detail/topic-detail.component.html
+++ b/client/src/app/site/topics/components/topic-detail/topic-detail.component.html
@@ -17,7 +17,7 @@
     </div>
 
     <!-- Menu -->
-    <div class="menu-slot">
+    <div class="menu-slot" *osPerms="'agenda.can_manage'">
         <button type="button" mat-icon-button [matMenuTriggerFor]="topicExtraMenu">
             <mat-icon>more_vert</mat-icon>
         </button>
@@ -107,7 +107,7 @@
 
 <mat-menu #topicExtraMenu="matMenu">
     <os-speaker-button [object]="topic" [menuItem]="true"></os-speaker-button>
-    <div *osPerms="'agenda.can_manage'">
+    <div>
         <mat-divider></mat-divider>
         <button mat-menu-item class="red-warning-text" (click)="onDeleteButton()">
             <mat-icon>delete</mat-icon>
diff --git a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.html b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.html
index 6596c7ce0..edacee4f0 100644
--- a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.html
+++ b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.html
@@ -3,7 +3,7 @@
         <h1 translate>List of speakers</h1>
         <h2>
             {{ getTitle() }}
-            <span *ngIf="getSpeakersCount() > 0">
+            <span *ngIf="getSpeakersCount() > 0 && !hideAmountOfSpeakers">
                 &ndash; {{ getSpeakersCount() }} <span translate>Speakers</span>
             </span>
         </h2>
diff --git a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts
index 435e5f0f6..c2b8697a8 100644
--- a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts
+++ b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts
@@ -1,20 +1,40 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 
 import { BaseSlideComponent } from 'app/slides/base-slide-component';
 import { CommonListOfSpeakersSlideData } from './common-list-of-speakers-slide-data';
 import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service';
 import { isBaseIsAgendaItemContentObjectRepository } from 'app/core/repositories/base-is-agenda-item-content-object-repository';
+import { ConfigService } from 'app/core/ui-services/config.service';
 
 @Component({
     selector: 'os-common-list-of-speakers-slide',
     templateUrl: './common-list-of-speakers-slide.component.html',
     styleUrls: ['./common-list-of-speakers-slide.component.scss']
 })
-export class CommonListOfSpeakersSlideComponent extends BaseSlideComponent<CommonListOfSpeakersSlideData> {
-    public constructor(private collectionStringMapperService: CollectionStringMapperService) {
+export class CommonListOfSpeakersSlideComponent extends BaseSlideComponent<CommonListOfSpeakersSlideData>
+    implements OnInit {
+    /**
+     * Boolean, whether the amount of speakers should be shown.
+     */
+    public hideAmountOfSpeakers: boolean;
+
+    public constructor(
+        private collectionStringMapperService: CollectionStringMapperService,
+        private configService: ConfigService
+    ) {
         super();
     }
 
+    /**
+     * OnInit-function.
+     * Load the config for `agenda_hide_amount_of_speakers`.
+     */
+    public ngOnInit(): void {
+        this.configService
+            .get<boolean>('agenda_hide_amount_of_speakers')
+            .subscribe(enabled => (this.hideAmountOfSpeakers = enabled));
+    }
+
     public getTitle(): string {
         if (!this.data.data.content_object_collection || !this.data.data.title_information) {
             return '';
diff --git a/openslides/agenda/config_variables.py b/openslides/agenda/config_variables.py
index 323792f28..588c1d007 100644
--- a/openslides/agenda/config_variables.py
+++ b/openslides/agenda/config_variables.py
@@ -121,6 +121,16 @@ def get_config_variables():
         validators=(MinValueValidator(0),),
     )
 
+    yield ConfigVariable(
+        name="agenda_hide_amount_of_speakers",
+        default_value=False,
+        input_type="boolean",
+        label="Hide the amount of speakers in subtitle of list of speakers slide",
+        weight=236,
+        group="Agenda",
+        subgroup="List of speakers",
+    )
+
     yield ConfigVariable(
         name="agenda_couple_countdown_and_speakers",
         default_value=False,