Simplify logic

This commit is contained in:
cuom1999 2023-01-27 17:51:38 -06:00
parent 64a5c73c21
commit bd05ba6b78
2 changed files with 3 additions and 14 deletions

View file

@ -585,19 +585,8 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView
]
def get_normal_queryset(self):
filter = Q(is_public=True)
if self.profile is not None:
filter |= Q(authors=self.profile)
filter |= Q(curators=self.profile)
filter |= Q(testers=self.profile)
queryset = (
Problem.objects.filter(filter).select_related("group").defer("description")
)
if not self.request.user.has_perm("see_organization_problem"):
filter = Q(is_organization_private=False)
if self.profile is not None:
filter |= Q(organizations__in=self.profile.organizations.all())
queryset = queryset.filter(filter)
queryset = Problem.get_visible_problems(self.request.user)
queryset = queryset.select_related("group")
if self.profile is not None and self.hide_solved:
queryset = queryset.exclude(
id__in=Submission.objects.filter(