Skip to content

Commit 6c19e9d

Browse files
committed
remove file filter in album list, re-add later if we can get it performant
1 parent 01615e6 commit 6c19e9d

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

src/albums/filters.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,9 @@ class AlbumFilters(ListFilters):
2525
sorting: FileAlbumSortingChoices | None = None
2626

2727

28-
def get_permitted_files(request: "HttpRequest") -> "QuerySet[BaseFile]":
29-
"""Called by AlbumFilter to get files for the albumlist filter multiselect form field."""
30-
return BaseFile.bmanager.get_permitted(user=request.user).all() # type: ignore[no-any-return]
31-
32-
3328
class AlbumFilter(django_filters.FilterSet):
3429
"""The Album filter used by django-filters."""
3530

36-
# when filtering by files only show files the user has permission for in the form
37-
files = django_filters.filters.ModelMultipleChoiceFilter(
38-
field_name="files",
39-
queryset=get_permitted_files,
40-
method="filter_files",
41-
)
42-
43-
def filter_files(self, queryset: "QuerySet[Album]", name: str, value: str) -> "QuerySet[Album]":
44-
"""When filtering by files only consider currently active memberships."""
45-
# we want AND so loop over files and filter for each,
46-
# finally returning only albums containing all the files in value
47-
for f in value:
48-
queryset = queryset.filter(memberships__basefile__in=[f], memberships__period__contains=timezone.now())
49-
return queryset
50-
5131
class Meta:
5232
"""Set model and fields."""
5333

0 commit comments

Comments
 (0)