From f7a1458b0d300b81a42ebdbc5da50a0ee9144e93 Mon Sep 17 00:00:00 2001 From: Loki Tobias Elble Date: Mon, 6 May 2024 13:41:49 +0200 Subject: [PATCH] Revert "adjust rest of names" This reverts commit 8e94cee63a86f116e33dfb42d061ef0c9e073bae. --- .../components/base-poll-form/base-poll-form.component.ts | 6 +++--- client/src/app/site/services/auth-check.service.ts | 4 ++-- .../repo-search-selector/repo-search-selector.component.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts index b5386ce5b3..c9574ec6ed 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts @@ -179,7 +179,7 @@ export abstract class BasePollFormComponent extends BaseComponent implements OnI private fb = inject(UntypedFormBuilder); public groupRepo = inject(GroupControllerService); private dialog = inject(VotingPrivacyWarningDialogService); - protected meetingSettingsService = inject(MeetingSettingsService); + protected meetingSettingService = inject(MeetingSettingsService); /** * Constructor. Retrieves necessary metadata from the pollService, * injects the poll itself @@ -257,9 +257,9 @@ export abstract class BasePollFormComponent extends BaseComponent implements OnI const pollType = this.data.content_object?.collection as PollClassType; if (!this.data.backend) { if (pollType !== `topic`) { - this.data.backend = this.meetingSettingsService.instant(`${pollType}_poll_default_backend`); + this.data.backend = this.meetingSettingService.instant(`${pollType}_poll_default_backend`); } else { - this.data.backend = this.meetingSettingsService.instant(`poll_default_backend`); + this.data.backend = this.meetingSettingService.instant(`poll_default_backend`); } } } diff --git a/client/src/app/site/services/auth-check.service.ts b/client/src/app/site/services/auth-check.service.ts index ff4c992484..8e12d6b07d 100644 --- a/client/src/app/site/services/auth-check.service.ts +++ b/client/src/app/site/services/auth-check.service.ts @@ -31,7 +31,7 @@ export class AuthCheckService { public constructor( private operator: OperatorService, private activeMeeting: ActiveMeetingService, - private meetingSettingsService: MeetingSettingsService, + private meetingSettingService: MeetingSettingsService, private osRouter: OpenSlidesRouterService ) {} @@ -97,6 +97,6 @@ export class AuthCheckService { if (!meetingSetting) { return true; } - return this.meetingSettingsService.instant(meetingSetting) as boolean; + return this.meetingSettingService.instant(meetingSetting) as boolean; } } diff --git a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts index 0ca66f7e86..70822d4a56 100644 --- a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts @@ -51,7 +51,7 @@ export class RepoSearchSelectorComponent extends BaseSearchSelectorComponent imp public constructor( @Optional() @Self() ngControl: NgControl, - private meetingSettingsService: MeetingSettingsService, + private meetingSettingService: MeetingSettingsService, private modelRequestService: ModelRequestService ) { super(ngControl); @@ -83,7 +83,7 @@ export class RepoSearchSelectorComponent extends BaseSearchSelectorComponent imp this.initItems(); if (this.defaultDataConfigKey) { this.subscriptions.push( - this.meetingSettingsService.get(this.defaultDataConfigKey).subscribe(value => { + this.meetingSettingService.get(this.defaultDataConfigKey).subscribe(value => { if (this.empty) { this.value = value as any; }