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

Merge pull request #5461 from tsiegleauq/list-of-speaker-slide-fix 

Add prefix to topic list of speaker slide
This commit is contained in:
Emanuel Schütze 2020-07-12 17:16:53 +02:00 committed by GitHub
parent a7703a5557 2835e746e8
commit 20175a1a6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/core/repositories/topics/topic-repository.service.ts
View File

@ -69,8 +69,7 @@ export class TopicRepositoryService extends BaseIsAgendaItemAndListOfSpeakersCon
};
public getAgendaSlideTitle = (titleInformation: TopicTitleInformation) => {
// Do not append ' (Topic)' to the title.
return this.getTitle(titleInformation);
return this.getAgendaListTitle(titleInformation).title;
};
public getVerboseName = (plural: boolean = false) => {

5
client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html
View File

@ -8,9 +8,8 @@
<!-- Title -->
<div class="title-slot">
<h2>
<span *ngIf="!isCurrentListOfSpeakers && !isSortMode">{{ 'List of speakers' | translate }}</span>
<span *ngIf="isCurrentListOfSpeakers && !isSortMode">{{ 'Current list of speakers' | translate }}</span>
<span *ngIf="isSortMode">{{ 'Sort list of speakers' | translate }}</span>
<span *ngIf="!isCurrentListOfSpeakers">{{ 'List of speakers' | translate }}</span>
<span *ngIf="isCurrentListOfSpeakers">{{ 'Current list of speakers' | translate }}</span>
</h2>
</div>
<div class="menu-slot" *osPerms="['agenda.can_manage_list_of_speakers', 'core.can_manage_projector']">