From 091fb5001fabe4946f909b5e35330593583ad76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20G=C3=A1borik?= Date: Mon, 5 May 2025 18:45:21 +0200 Subject: [PATCH 1/2] Make public competitions visible for admins. --- bullet/competitions/models/competitions.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bullet/competitions/models/competitions.py b/bullet/competitions/models/competitions.py index 823b5686..f792715a 100644 --- a/bullet/competitions/models/competitions.py +++ b/bullet/competitions/models/competitions.py @@ -50,7 +50,11 @@ def for_user(self, user: "User", branch: "Branch"): roles = CompetitionRole.objects.filter( user=user, competition__branch=branch ).values("competition") - return qs.filter(id__in=roles) + competitions = roles.union( + qs.filter(results_public=True) + .values("id") + ) + return qs.filter(id__in=competitions) def for_photos(self, user: "User", branch: "Branch"): """ @@ -68,7 +72,11 @@ def for_photos(self, user: "User", branch: "Branch"): roles = CompetitionRole.objects.filter( user=user, competition__branch=branch ).values("competition") - return qs.filter(id__in=roles) + competitions = roles.union( + qs.filter(results_public=True) + .values("id") + ) + return qs.filter(id__in=competitions) class Competition(models.Model): From ee0e3abe965c58e0b54cfe7090e0e97c4645f757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20G=C3=A1borik?= Date: Mon, 5 May 2025 18:59:33 +0200 Subject: [PATCH 2/2] Linter fix --- bullet/competitions/models/competitions.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bullet/competitions/models/competitions.py b/bullet/competitions/models/competitions.py index f792715a..1297cb76 100644 --- a/bullet/competitions/models/competitions.py +++ b/bullet/competitions/models/competitions.py @@ -50,10 +50,7 @@ def for_user(self, user: "User", branch: "Branch"): roles = CompetitionRole.objects.filter( user=user, competition__branch=branch ).values("competition") - competitions = roles.union( - qs.filter(results_public=True) - .values("id") - ) + competitions = roles.union(qs.filter(results_public=True).values("id")) return qs.filter(id__in=competitions) def for_photos(self, user: "User", branch: "Branch"): @@ -72,10 +69,7 @@ def for_photos(self, user: "User", branch: "Branch"): roles = CompetitionRole.objects.filter( user=user, competition__branch=branch ).values("competition") - competitions = roles.union( - qs.filter(results_public=True) - .values("id") - ) + competitions = roles.union(qs.filter(results_public=True).values("id")) return qs.filter(id__in=competitions)