Merge pull request #995 from lakridserne/bug/membership_activities_no…

…t_ordered_correctly Make sure membership activities are ordered correctly
CodingPirates · Jan 14, 2024 · 3136669 · 3136669
2 parents 891a1cf + acb8beb
commit 3136669
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/members/management/commands/create_membership_activities.py b/members/management/commands/create_membership_activities.py
@@ -26,13 +26,13 @@ def handle(self, *args, **options):
 
             localDepartments = str.join(
                 ", ",
-                Department.objects.filter(union=curUnion).values_list(
+                Department.objects.filter(union=curUnion, closed_dtm=None).values_list(
                     "name", flat=True
                 ),
             )
 
             try:
-                department = Department.objects.get(name=localDepartments)
+                department = Department.objects.get(name=curUnion.name)
             except Exception:
                 print("Using backup main department at %s" % (curUnion.name))
                 pass

diff --git a/members/views/Membership.py b/members/views/Membership.py
@@ -21,7 +21,7 @@ def Membership(request):
     current_activities = Activity.objects.filter(
         signup_closing__gte=timezone.now(),
         activitytype__in=["FORENINGSMEDLEMSKAB"],
-    ).order_by("department__address__region", "-name", "start_date")
+    ).order_by("department__union__address__region", "name", "start_date")
 
     family = None
     participating = None