diff --git a/client/src/app/site/pages/meetings/base/base-meeting.component.ts b/client/src/app/site/pages/meetings/base/base-meeting.component.ts
index 23061db182..51d1a55479 100644
--- a/client/src/app/site/pages/meetings/base/base-meeting.component.ts
+++ b/client/src/app/site/pages/meetings/base/base-meeting.component.ts
@@ -1,6 +1,7 @@
import { Directive, inject } from '@angular/core';
import { Id } from 'src/app/domain/definitions/key-types';
import { BaseComponent } from 'src/app/site/base/base.component';
+import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service';
import { ActiveMeetingService } from '../services/active-meeting.service';
import { ActiveMeetingIdService } from '../services/active-meeting-id.service';
@@ -31,4 +32,6 @@ export abstract class BaseMeetingComponent extends BaseComponent {
}
public override componentServiceCollector = inject(MeetingComponentServiceCollectorService);
+
+ public orgaSettingsService = inject(OrganizationSettingsService);
}
diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html
index 307e5235d5..9aba4033c2 100644
--- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html
+++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html
@@ -99,7 +99,7 @@
{{ setting.helpText | translate }}
}
- @if (getWarning()) {
+ @if (hasWarning()) {
{{ setting.warnText | translate }}
diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts
index bd0dbe1146..cd2ed29fa3 100644
--- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts
+++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts
@@ -226,7 +226,7 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl
}
]
});
- if (this.disabled) {
+ if (this.disabled || this.hasWarning()) {
this.form.disable();
}
this.internalValue = this.value ?? this.meetingSettingsDefinitionProvider.getDefaultValue(this.setting);
@@ -278,7 +278,7 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl
* Checks if a warning should be given
*
*/
- public getWarning(): boolean {
+ public hasWarning(): boolean {
if (this.setting.warn) {
return this.setting.warn(this.orgaSettings);
} else {
diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts
index a3dc30e7a1..ea528557e5 100644
--- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts
@@ -97,7 +97,10 @@ export class GroupListComponent extends BaseMeetingComponent implements OnInit,
this.repo.getViewModelListObservable().subscribe(newViewGroups => {
if (newViewGroups) {
- if (!this.meetingSettingsService.instant(`enable_anonymous`)) {
+ if (
+ !this.meetingSettingsService.instant(`enable_anonymous`) ||
+ !this.orgaSettingsService.instant(`enable_anonymous`)
+ ) {
newViewGroups = newViewGroups.filter(group => !group.anonymous_group_for_meeting_id);
} else {
newViewGroups = newViewGroups.slice();