From 70b437b5f6db572aa2f98248f278da4b243fa83a Mon Sep 17 00:00:00 2001
From: AndiEcker <aecker2@gmail.com>
Date: Sat, 2 Dec 2023 14:30:32 +0000
Subject: [PATCH] V0.3.97: allow multiple forms with notify member checkboxes

M  kairos/__init__.py
M  mbr_announcements/templates/memberannouncement_plugin.html
M  mbr_announcements/views.py
M  mbr_messages/templates/mbr_messages/membermessage_edit.html
M  mbr_messages/views.py
---
 kairos/__init__.py                                          | 2 +-
 mbr_announcements/templates/memberannouncement_plugin.html  | 4 ++--
 mbr_announcements/views.py                                  | 2 +-
 mbr_messages/templates/mbr_messages/membermessage_edit.html | 4 ++--
 mbr_messages/views.py                                       | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kairos/__init__.py b/kairos/__init__.py
index 2f399a2..13e9ff0 100644
--- a/kairos/__init__.py
+++ b/kairos/__init__.py
@@ -63,4 +63,4 @@ TODO:
 
 """
 
-__version__ = '0.3.96'
+__version__ = '0.3.97'
diff --git a/mbr_announcements/templates/memberannouncement_plugin.html b/mbr_announcements/templates/memberannouncement_plugin.html
index 97afdd0..ff2b18f 100644
--- a/mbr_announcements/templates/memberannouncement_plugin.html
+++ b/mbr_announcements/templates/memberannouncement_plugin.html
@@ -84,8 +84,8 @@
                               placeholder="{% blocktranslate %}({{ ma_act }} in {{ cat_name }}){% endblocktranslate %}"
                               style="min-width: 100%"
                     >{% if EXC_ADD_MARKER not in ma_desc or user.is_staff %}{{ ma_desc }}{% endif %}</textarea>
-                    <input id="notify_members" type="checkbox" name="notify_members" checked>
-                    <label for="notify_members" class="col-form-label">{% translate "Notify members" %}</label>
+                    <input id="notify_members_{{ exc.pk }}" type="checkbox" name="notify_members" checked><label
+                       for="notify_members_{{ exc.pk }}" class="col-form-label">{% translate "Notify members" %}</label>
                     {% if can_del %}
                         <input class="btn btn-outline-info btn-sm" type="submit" value="{% translate "Delete" %}"
                                formaction="{% url 'announcement-delete' cat_name|slugify exc.id %}"
diff --git a/mbr_announcements/views.py b/mbr_announcements/views.py
index ebcb145..ce99349 100644
--- a/mbr_announcements/views.py
+++ b/mbr_announcements/views.py
@@ -122,7 +122,7 @@ class AnnouncementsListView(ListView):
 
         else:
             cat_slug = kwargs['cat']
-            notify_members = request.POST.get('notify_members') == 'on'
+            notify_members = request.POST.get(f'notify_members_{ma_id}') == 'on'
             if request.path.split("/")[-3] == 'delete':
                 del_rec = MemberAnnouncement.objects.get(id=ma_id)  # pylint: disable=no-member # false positive
                 pre_rec = self.get_queryset().filter(ma_last_updated__lt=del_rec.ma_last_updated).first()
diff --git a/mbr_messages/templates/mbr_messages/membermessage_edit.html b/mbr_messages/templates/mbr_messages/membermessage_edit.html
index 3bedfba..cb21fef 100644
--- a/mbr_messages/templates/mbr_messages/membermessage_edit.html
+++ b/mbr_messages/templates/mbr_messages/membermessage_edit.html
@@ -41,8 +41,8 @@
         </div>
         <div class="row pt-1">
             <div class="col-12 col-lg-5 ml-1 ml-lg-3">
-                <input id="notify_members" type="checkbox" name="notify_members" checked>
-                <label for="notify_members" class="col-form-label">{% translate "Notify members" %}</label>
+                <input id="notify_members_{{ msg.pk }}" type="checkbox" name="notify_members" checked><label
+                      for="notify_members_{{ msg.pk }}" class="col-form-label">{% translate "Notify members" %}</label>
             </div>
             <div class="col-6 col-lg-3">
             {% if perms.mbr_messages.delete_membermessage %}
diff --git a/mbr_messages/views.py b/mbr_messages/views.py
index 3a38098..3985f60 100644
--- a/mbr_messages/views.py
+++ b/mbr_messages/views.py
@@ -116,7 +116,7 @@ class MemberMessageListView(ListView):
             url = reverse('message-edit', kwargs={'id': mm_id})
 
         else:
-            notify_members = request.POST.get('notify_members') == 'on'
+            notify_members = request.POST.get(f'notify_members_{mm_id}') == 'on'
             if request.path.split("/")[-2] == 'delete':
                 rec = MemberMessage.objects.get(id=mm_id)       # pylint: disable=no-member # false positive
                 pre_rec = self.get_queryset().filter(mm_created__lt=rec.mm_created).first()
@@ -130,7 +130,7 @@ class MemberMessageListView(ListView):
                     send_chg_notif('deleted', ([f"- {rec.mm_expired}"] if rec.mm_expired else []) + [txt], current_user,
                                    owner=rec.mm_author,
                                    item=_("public message") if rec.mm_public else _("private message"),
-                                   notify_membersr=notify_members)
+                                   notify_members=notify_members)
                 rec.delete()
 
             else:   # == 'update'
-- 
GitLab