From 377e73a49147cd4c790ec7ab5c8bd417a69853a4 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin@bauer.tech>
Date: Thu, 9 Apr 2026 14:50:28 +0200
Subject: [PATCH] Fixes in event handling

---
 eventplanner/serializers.py                     | 17 +++++++++++------
 .../eventplanner/event_update_form.html         |  5 ++++-
 .../templates/eventplanner/events_grid.html     |  2 +-
 eventplanner/views.py                           |  2 +-
 .../templates/website/slider_intern_area.html   | 14 --------------
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/eventplanner/serializers.py b/eventplanner/serializers.py
index d17a164..c915f50 100644
--- a/eventplanner/serializers.py
+++ b/eventplanner/serializers.py
@@ -9,8 +9,8 @@ class ParticipationSerializer(serializers.Serializer):
 
     event = serializers.PrimaryKeyRelatedField(queryset=Event.objects.all())
     user = serializers.CharField()
-    status = serializers.CharField(required=False, default="-")
-    comment = serializers.CharField(required=False, allow_blank=True, default="")
+    status = serializers.CharField(required=False)
+    comment = serializers.CharField(required=False, allow_blank=True)
 
     def to_representation(self, instance):
         """Serialize an EventParticipation instance."""
@@ -32,14 +32,19 @@ class ParticipationSerializer(serializers.Serializer):
         """Create or update EventParticipation based on event and user."""
         event = validated_data.get("event")
         user = validated_data.get("user")
-        status = validated_data.get("status", "-")
-        comment = validated_data.get("comment", "")
 
-        # Use update_or_create to handle both new and existing participations
+        # Only include fields that were actually present in the request,
+        # so a status-only update doesn't wipe the comment (and vice versa).
+        defaults = {}
+        if "status" in validated_data:
+            defaults["status"] = validated_data["status"]
+        if "comment" in validated_data:
+            defaults["comment"] = validated_data["comment"]
+
         participation, created = EventParticipation.objects.update_or_create(
             event=event,
             user=user,
-            defaults={"status": status, "comment": comment},
+            defaults=defaults,
         )
 
         return participation
diff --git a/eventplanner/templates/eventplanner/event_update_form.html b/eventplanner/templates/eventplanner/event_update_form.html
index 2fcd289..c279082 100644
--- a/eventplanner/templates/eventplanner/event_update_form.html
+++ b/eventplanner/templates/eventplanner/event_update_form.html
@@ -1,4 +1,7 @@
-{% extends "website/base.html" %} {% load sekizai_tags static %} {% load crispy_forms_tags %} {% block content %} {{ form.media }}
+{% extends "website/base.html" %} {% load sekizai_tags static %} {% load crispy_forms_tags %}
+{% block content %}
+{% addtoblock "css" %}{% for item in form.media.render_css %}{{ item }}{% endfor %}{% endaddtoblock %}
+{% addtoblock "js" %}{% for item in form.media.render_js %}{{ item }}{% endfor %}{% endaddtoblock %}
 
 <div class="container">
     <div class="row">
diff --git a/eventplanner/templates/eventplanner/events_grid.html b/eventplanner/templates/eventplanner/events_grid.html
index 5e7a03d..46b5b44 100644
--- a/eventplanner/templates/eventplanner/events_grid.html
+++ b/eventplanner/templates/eventplanner/events_grid.html
@@ -116,7 +116,7 @@
 	 		$( ".deleteButton" ).click(function() {
 	 			if (confirm('Termin wirklich löschen?')) {
 	 				pk = $(this).data( "pk" )
-	 				window.location = pk + "/delete"
+	 				window.location = "/events/delete/" + pk + "/"
 	 			}
 	 		});
 
diff --git a/eventplanner/views.py b/eventplanner/views.py
index 294f6a6..444d403 100644
--- a/eventplanner/views.py
+++ b/eventplanner/views.py
@@ -118,7 +118,7 @@ def deleteEvent(request, pk):
     if not EventParticipation.isAdmin(request.user):
         raise PermissionDenied
     Event.objects.get(pk=pk).delete()
-    return redirect(events_grid)
+    return redirect("eventplanner:events_grid")
 
 
 # ------------------------------------ Detail Views ----------------------------------------------------
diff --git a/website/templates/website/slider_intern_area.html b/website/templates/website/slider_intern_area.html
index 2426978..10b935e 100644
--- a/website/templates/website/slider_intern_area.html
+++ b/website/templates/website/slider_intern_area.html
@@ -88,20 +88,6 @@ planning {% endcomment %} {% addtoblock "css" %}
         </div>
     </article>
 
-    <article
-        class="slide"
-        id="slide_messages"
-        style="background: url('{{STATIC_URL}}img/backgrounds/silver.jpg') repeat-x top center;"
-    >
-        <img
-            class="asset left-30 sp600 t120 z1"
-            src="{{STATIC_URL}}img/slides/gruppe.png"
-        />
-        <div class="info">
-            <a href="/messages">Forum</a>
-            <div class="subtitle">Nachricht an alle schreiben...</div>
-        </div>
-    </article>
 
     <article
         class="slide"