Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix - remove rob assignment view study duplicates #885

Merged
merged 4 commits into from Sep 9, 2023
Merged

bugfix - remove rob assignment view study duplicates #885

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cd1fcf
prevent duplicates on rob assignment views
shapiromatron Aug 27, 2023
72dfb14
Merge branch 'main' into rob-dup
shapiromatron Aug 28, 2023
9bec6da
Merge branch 'main' into rob-dup
caseyhans Sep 8, 2023
70f6f07
Merge branch 'main' into rob-dup
shapiromatron Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions hawc/apps/study/filterset.py
View file
Open in desktop
@@ -1,5 +1,5 @@
import django_filters as df
from django.db.models import Q
from django.db.models import Q, Subquery

from ..common.filterset import BaseFilterSet, InlineFilterForm, PaginationFilter
from ..myuser.models import HAWCUser
Expand Down Expand Up @@ -49,7 +49,11 @@ def filter_queryset(self, queryset):
query = Q(assessment=self.assessment)
if not self.perms["edit"]:
query &= Q(published=True)
return queryset.filter(query)
return self._meta.model.objects.filter(
id__in=Subquery(
queryset.filter(query).order_by("id").distinct("id").values_list("id", flat=True)
)
)

def filter_query(self, queryset, name, value):
query = (
Expand Down