Skip to content

Commit

Permalink
Revert "adjust rest of names"
Browse files Browse the repository at this point in the history
This reverts commit 8e94cee.
  • Loading branch information
Loki Tobias Elble committed May 6, 2024
1 parent bb01329 commit f7a1458
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/site/services/auth-check.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class AuthCheckService {
public constructor(
private operator: OperatorService,
private activeMeeting: ActiveMeetingService,
private meetingSettingsService: MeetingSettingsService,
private meetingSettingService: MeetingSettingsService,
private osRouter: OpenSlidesRouterService
) {}

Expand Down Expand Up @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit f7a1458

Please sign in to comment.