Merge branch 'release/5.10.1' into 'master'

Release 5.10.1

See merge request os2borgerpc/os2borgerpc-admin-site!375

Author: Marcus Funch

NEWS.rst

@@ -1,3 +1,8 @@
+Version 5.10.1, December 19, 2022
+---------------------------------
+
+- Fix bug where security problems showed up on the groups for other sites on the group page
+
 Version 5.10.0, December 14, 2022
 ---------------------------------
 

VERSION

@@ -1 +1 @@
-5.10.0
+5.10.1

admin_site/system/views.py

@@ -2293,7 +2293,7 @@ def get_context_data(self, **kwargs):
         # Manually create a list of security problems to not only include those attached but also those
         # unattached which currently apply to all groups
         context["security_problems_incl_site"] = group.security_problems.all().union(
-            SecurityProblem.objects.filter(alert_groups=None)
+            SecurityProblem.objects.filter(alert_groups=None, site=site)
         )
 
         # PC picklist related

admin_site/templates/system/pcgroups/site_groups.html

@@ -45,11 +45,11 @@
     <h2 class="divideheader">Detaljer om <em>{{ selected_group.name }}</em></h2>
     {% include 'notification.html' %}
 
-    <form name="updategroupform" 
+    <form name="updategroupform"
       id="updategroupform"
       action="{% url 'group' site.uid selected_group.url %}"
-      method="post" 
-      enctype="multipart/form-data" 
+      method="post"
+      enctype="multipart/form-data"
       class="row-fluid"
       onsubmit="updateScriptPositions()">