diff --git a/client/src/app/core/repositories/topics/topic-repository.service.ts b/client/src/app/core/repositories/topics/topic-repository.service.ts index 7f75a32d3..336fd5ae8 100644 --- a/client/src/app/core/repositories/topics/topic-repository.service.ts +++ b/client/src/app/core/repositories/topics/topic-repository.service.ts @@ -53,16 +53,19 @@ export class TopicRepositoryService extends BaseIsAgendaItemAndListOfSpeakersCon } public getTitle = (titleInformation: TopicTitleInformation) => { + return titleInformation.title; + }; + + public getListTitle = (titleInformation: TopicTitleInformation) => { if (titleInformation.agenda_item_number && titleInformation.agenda_item_number()) { return `${titleInformation.agenda_item_number()} ยท ${titleInformation.title}`; } else { - return titleInformation.title; + return this.getTitle(titleInformation); } }; public getAgendaListTitle = (titleInformation: TopicTitleInformation) => { - // Do not append ' (Topic)' to the title. - return { title: this.getTitle(titleInformation) }; + return { title: this.getListTitle(titleInformation) }; }; public getAgendaSlideTitle = (titleInformation: TopicTitleInformation) => { diff --git a/client/src/app/site/agenda/services/agenda-pdf.service.ts b/client/src/app/site/agenda/services/agenda-pdf.service.ts index 5473d74e4..38a0be1e1 100644 --- a/client/src/app/site/agenda/services/agenda-pdf.service.ts +++ b/client/src/app/site/agenda/services/agenda-pdf.service.ts @@ -87,7 +87,7 @@ export class AgendaPdfService { text: nodeItem.item.item_number }, { - text: nodeItem.item.contentObject.getListTitle() + text: nodeItem.item.contentObject.getTitle() } ] }; diff --git a/client/src/app/site/base/base-view-model-with-agenda-item.ts b/client/src/app/site/base/base-view-model-with-agenda-item.ts index 6f9af9e3c..a8944706e 100644 --- a/client/src/app/site/base/base-view-model-with-agenda-item.ts +++ b/client/src/app/site/base/base-view-model-with-agenda-item.ts @@ -68,7 +68,7 @@ export abstract class BaseViewModelWithAgendaItem< */ public getProjectorTitle(): ProjectorTitle { const subtitle = this.item ? this.item.comment : null; - return { title: this.getTitle(), subtitle }; + return { title: this.getListTitle(), subtitle }; } /** 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 3ec116a89..ae5281cef 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 @@ -27,7 +27,7 @@
-

{{ topic.getTitle() }}

+

{{ topic.getListTitle() }}