Skip to content

Fix duplicate field meeting create form #6446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Elblinator wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix duplicate field meeting create form #6446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13c8e85
Move template call
Elblinator Jul 27, 2026
c45bc17
Remove not needed optional
Elblinator Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions ...detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core';
import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { Id } from '@app/domain/definitions/key-types';
Expand All @@ -21,7 +21,6 @@ import { TimeZoneService } from '@app/site/services/time-zone.service';
import { UserControllerService } from '@app/site/services/user-controller.service';
import { RoutingStateService } from '@app/ui/modules/head-bar/services/routing-state.service';
import { _ } from '@ngx-translate/core';
import { TranslateService } from '@ngx-translate/core';
import { BehaviorSubject, map, Observable } from 'rxjs';

import { CommitteeControllerService } from '../../../../../../services/committee-controller.service';
Expand Down Expand Up @@ -112,21 +111,20 @@ export class MeetingEditComponent extends BaseComponent implements OnInit {
return this.meetingForm?.get(`daterange`);
}

public constructor(
protected override translate: TranslateService,
private route: ActivatedRoute,
private formBuilder: UntypedFormBuilder,
private meetingRepo: MeetingControllerService,
private committeeRepo: CommitteeControllerService,
public orgaTagRepo: OrganizationTagControllerService,
private orgaSettings: OrganizationSettingsService,
private operator: OperatorService,
private userRepo: UserControllerService,
private openslidesRouter: OpenSlidesRouterService,
private orga: OrganizationService,
private routingState: RoutingStateService,
private timeZone: TimeZoneService
) {
public orgaTagRepo = inject(OrganizationTagControllerService);
private route = inject(ActivatedRoute);
private formBuilder = inject(UntypedFormBuilder);
private meetingRepo = inject(MeetingControllerService);
private committeeRepo = inject(CommitteeControllerService);
private orgaSettings = inject(OrganizationSettingsService);
private operator = inject(OperatorService);
private userRepo = inject(UserControllerService);
private openslidesRouter = inject(OpenSlidesRouterService);
private orga = inject(OrganizationService);
private routingState = inject(RoutingStateService);
private timeZone = inject(TimeZoneService);

public constructor() {
super();
this.checkCreateView();
this.createForm();
Expand All @@ -139,8 +137,12 @@ export class MeetingEditComponent extends BaseComponent implements OnInit {
super.setTitle(EDIT_MEETING_LABEL);
this.meetingForm.get(`language`)?.disable();
}

this.availableUsers = userRepo.getViewModelListObservable();
this.availableMeetingsObservable = this.orga.organizationObservable.pipe(
map(organization => {
return [...organization.template_meetings.sort(this.sortFn)];
})
);
this.availableUsers = this.userRepo.getViewModelListObservable();
}

public ngOnInit(): void {
Expand All @@ -161,11 +163,6 @@ export class MeetingEditComponent extends BaseComponent implements OnInit {
.subscribe((value: boolean) => (this.requireDuplicateFrom = value))
);

this.availableMeetingsObservable = this.orga.organizationObservable.pipe(
map(organization => {
return [...organization.template_meetings.sort(this.sortFn)];
})
);
this.availableAdmins = this.filterAccountsForCommitteeAdmins(this.userRepo.getViewModelList());
}

Expand Down Expand Up @@ -456,13 +453,6 @@ export class MeetingEditComponent extends BaseComponent implements OnInit {
}
}

private makeDatesValid(endDateChanged: boolean): void {
if (!this.isTimeValid) {
const patchValue = endDateChanged ? this.daterangeControl?.value.end : this.daterangeControl?.value.start;
this.daterangeControl?.patchValue({ start: patchValue, end: patchValue });
}
}

public get isCommitteeManagerAndRequireDuplicateFrom(): boolean {
return this.requireDuplicateFrom && !this.operator.isOrgaManager;
}
Expand Down
Loading