ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5034 from GabrielInTheWorld/permsOfAgenda

Browse Source 
Fixes seeing list of speakers in topic-detail
This commit is contained in:
Emanuel Schütze 2019-09-17 19:10:59 +02:00 committed by GitHub
commit d8296f3e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
View File

@ -97,7 +97,7 @@
<os-projector-button [object]="itemListSlide" [menuItem]="true"></os-projector-button> <os-projector-button [object]="itemListSlide" [menuItem]="true"></os-projector-button>
<!-- Current list of speakers --> <!-- Current list of speakers -->
<button mat-menu-item routerLink="speakers"> <button mat-menu-item *osPerms="'agenda.can_see_list_of_speakers'" routerLink="speakers">
<mat-icon>mic</mat-icon> <mat-icon>mic</mat-icon>
<span translate>Current list of speakers</span> <span translate>Current list of speakers</span>
</button> </button>

4
client/src/app/site/topics/components/topic-detail/topic-detail.component.html
View File

@ -18,7 +18,7 @@
</div> </div>
<!-- Menu --> <!-- Menu -->
<div class="menu-slot" *osPerms="'agenda.can_manage'"> <div class="menu-slot" *osPerms="'agenda.can_manage'; or: 'agenda.can_see_list_of_speakers'">
<button type="button" mat-icon-button [matMenuTriggerFor]="topicExtraMenu"> <button type="button" mat-icon-button [matMenuTriggerFor]="topicExtraMenu">
<mat-icon>more_vert</mat-icon> <mat-icon>more_vert</mat-icon>
</button> </button>
@ -105,7 +105,7 @@
<os-speaker-button [object]="topic" [menuItem]="true"></os-speaker-button> <os-speaker-button [object]="topic" [menuItem]="true"></os-speaker-button>
<div> <div>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<button mat-menu-item class="red-warning-text" (click)="onDeleteButton()"> <button *osPerms="'agenda.can_manage'" mat-menu-item class="red-warning-text" (click)="onDeleteButton()">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
<span translate>Delete</span> <span translate>Delete</span>
</button> </button>