Skip to content

Fix empty sort dropdown on secondary issue list views #589

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

Merged
bpepple merged 1 commit into from
Aug 7, 2026
Merged

Fix empty sort dropdown on secondary issue list views #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion comicsdb/views/arc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from comicsdb.models.issue import Issue
from comicsdb.views.constants import DETAIL_PAGINATE_BY, PAGINATE_BY
from comicsdb.views.history import HistoryListView
from comicsdb.views.issue_list_helpers import SORT_OPTIONS, apply_sort
from comicsdb.views.mixins import (
AttributionCreateMixin,
AttributionUpdateMixin,
Expand Down Expand Up @@ -43,11 +44,14 @@ class ArcIssueList(ListView):

def get_queryset(self):
self.arc = get_object_or_404(Arc, slug=self.kwargs["slug"])
return self.arc.issues.all().select_related("series", "series__series_type")
queryset = self.arc.issues.all().select_related("series", "series__series_type")
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = self.arc
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


Expand Down
15 changes: 13 additions & 2 deletions comicsdb/views/character.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from comicsdb.models import Character, Issue, Series
from comicsdb.views.constants import DETAIL_PAGINATE_BY, PAGINATE_BY
from comicsdb.views.history import HistoryListView
from comicsdb.views.issue_list_helpers import SORT_OPTIONS, apply_sort
from comicsdb.views.mixins import (
AttributionCreateMixin,
AttributionUpdateMixin,
Expand All @@ -31,9 +32,16 @@ def get_queryset(self):
self.series = get_object_or_404(Series, slug=self.kwargs["series"])
self.character = get_object_or_404(Character, slug=self.kwargs["character"])

return Issue.objects.select_related("series").filter(
queryset = Issue.objects.select_related("series").filter(
characters=self.character, series=self.series
)
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


_issue_count_qs = (
Expand All @@ -56,11 +64,14 @@ class CharacterIssueList(ListView):

def get_queryset(self):
self.character = get_object_or_404(Character, slug=self.kwargs["slug"])
return self.character.issues.all().select_related("series", "series__series_type")
queryset = self.character.issues.all().select_related("series", "series__series_type")
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = self.character
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


Expand Down
15 changes: 13 additions & 2 deletions comicsdb/views/creator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from comicsdb.models import Creator, Credits, Issue, Series
from comicsdb.views.constants import DETAIL_PAGINATE_BY, PAGINATE_BY
from comicsdb.views.history import HistoryListView
from comicsdb.views.issue_list_helpers import SORT_OPTIONS, apply_sort
from comicsdb.views.mixins import (
AttributionCreateMixin,
AttributionUpdateMixin,
Expand All @@ -37,9 +38,16 @@ class CreatorSeriesList(ListView):
def get_queryset(self):
self.series = get_object_or_404(Series, slug=self.kwargs["series"])
self.creator = get_object_or_404(Creator, slug=self.kwargs["creator"])
return Issue.objects.select_related("series").filter(
queryset = Issue.objects.select_related("series").filter(
creators=self.creator, series=self.series
)
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


class CreatorIssueList(ListView):
Expand All @@ -48,11 +56,14 @@ class CreatorIssueList(ListView):

def get_queryset(self):
self.creator = get_object_or_404(Creator, slug=self.kwargs["slug"])
return self.creator.issues.all().select_related("series", "series__series_type")
queryset = self.creator.issues.all().select_related("series", "series__series_type")
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = self.creator
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


Expand Down
6 changes: 5 additions & 1 deletion comicsdb/views/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from comicsdb.models.issue import Issue
from comicsdb.views.constants import PAGINATE_BY
from comicsdb.views.history import HistoryListView
from comicsdb.views.issue_list_helpers import SORT_OPTIONS, apply_sort
from comicsdb.views.mixins import (
AttributionCreateMixin,
AttributionUpdateMixin,
Expand Down Expand Up @@ -62,11 +63,14 @@ class SeriesIssueList(ListView):

def get_queryset(self):
self.series = get_object_or_404(Series, slug=self.kwargs["slug"])
return self.series.issues.all()
queryset = self.series.issues.all()
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = self.series
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


Expand Down
6 changes: 5 additions & 1 deletion comicsdb/views/team.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from comicsdb.models.team import Team
from comicsdb.views.constants import DETAIL_PAGINATE_BY, PAGINATE_BY
from comicsdb.views.history import HistoryListView
from comicsdb.views.issue_list_helpers import SORT_OPTIONS, apply_sort
from comicsdb.views.mixins import (
AttributionCreateMixin,
AttributionUpdateMixin,
Expand Down Expand Up @@ -43,11 +44,14 @@ class TeamIssueList(ListView):

def get_queryset(self):
self.team = get_object_or_404(Team, slug=self.kwargs["slug"])
return self.team.issues.all().select_related("series", "series__series_type")
queryset = self.team.issues.all().select_related("series", "series__series_type")
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = self.team
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


Expand Down
15 changes: 13 additions & 2 deletions comicsdb/views/universe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from comicsdb.models.universe import Universe
from comicsdb.views.constants import DETAIL_PAGINATE_BY, PAGINATE_BY
from comicsdb.views.history import HistoryListView
from comicsdb.views.issue_list_helpers import SORT_OPTIONS, apply_sort
from comicsdb.views.mixins import (
AttributionCreateMixin,
AttributionUpdateMixin,
Expand Down Expand Up @@ -54,9 +55,16 @@ def get_queryset(self):
self.series = get_object_or_404(Series, slug=self.kwargs["series"])
self.universe = get_object_or_404(Universe, slug=self.kwargs["universe"])

return Issue.objects.select_related("series").filter(
queryset = Issue.objects.select_related("series").filter(
universes=self.universe, series=self.series
)
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


class UniverseList(ListView):
Expand All @@ -71,11 +79,14 @@ class UniverseIssueList(ListView):

def get_queryset(self):
self.universe = get_object_or_404(Universe, slug=self.kwargs["slug"])
return self.universe.issues.all().select_related("series", "series__series_type")
queryset = self.universe.issues.all().select_related("series", "series__series_type")
return apply_sort(queryset, self.request)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = self.universe
context["sort_options"] = SORT_OPTIONS
context["current_sort"] = self.request.GET.get("sort", "")
return context


Expand Down
Loading