From 7f0bf00aadd9eccc01d39efac639cc0e5347ff36 Mon Sep 17 00:00:00 2001
From: Bastian Rihm <brihm@intevation.de>
Date: Tue, 17 Oct 2023 13:04:41 +0200
Subject: [PATCH] Fix meeting admin update as committee admin (#2901)

---
 .../gateways/repositories/meeting-repository.service.ts    | 7 +++++++
 .../components/meeting-edit/meeting-edit.component.ts      | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/src/app/gateways/repositories/meeting-repository.service.ts b/client/src/app/gateways/repositories/meeting-repository.service.ts
index 38d009bf52..34c44769d4 100644
--- a/client/src/app/gateways/repositories/meeting-repository.service.ts
+++ b/client/src/app/gateways/repositories/meeting-repository.service.ts
@@ -137,6 +137,13 @@ export class MeetingRepositoryService extends BaseRepository<ViewMeeting, Meetin
             update.start_time = this.anyDateToUnix(update.start_time);
             update.end_time = this.anyDateToUnix(update.end_time);
         }
+        if (meeting && meeting.start_time === undefined && update.start_time === null) {
+            delete update.start_time;
+        }
+        if (meeting && meeting.end_time === undefined && update.end_time === null) {
+            delete update.end_time;
+        }
+
         if (update.organization_tag_ids === null) {
             update.organization_tag_ids = [];
         }
diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts
index 3eba0d317a..bb824eeac3 100644
--- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts
+++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts
@@ -107,7 +107,12 @@ export class MeetingEditComponent extends BaseComponent implements OnInit {
     public committee!: ViewCommittee;
 
     public get meetingUsers(): ViewUser[] {
-        return this.editMeeting?.calculated_users || [];
+        const users = this.editMeeting?.calculated_users;
+        if (users && !users.some(u => u.id === this.operator.operatorId)) {
+            users.push(this.operator.user);
+        }
+
+        return users || [];
     }
 
     private meetingId: Id | null = null;