Make filtering act on all descendants, like searching does

pull/11339/head
Matt Westcott 2023-12-12 23:12:24 +00:00 zatwierdzone przez Sage Abdullah
rodzic 1b97e21e20
commit 63e11a2d42
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: EB1A33CC51CC0217
3 zmienionych plików z 4 dodań i 2 usunięć

Wyświetl plik

@ -4,7 +4,7 @@
{% block after_label %}
{% if page_obj %}
{% with start_index=page_obj.start_index end_index=page_obj.end_index result_count=page_obj.paginator.count %}
{% if is_searching %}
{% if is_searching or is_filtering %}
{% if is_searching_whole_tree %}
{% blocktranslate trimmed %}
{{ start_index }}-{{ end_index }} of {{ result_count }} across entire site.

Wyświetl plik

@ -14,6 +14,7 @@ class PageTitleColumn(BaseColumn):
context["page_obj"] = parent_context.get("page_obj")
context["parent_page"] = parent_context.get("parent_page")
context["is_searching"] = parent_context.get("is_searching")
context["is_filtering"] = parent_context.get("is_filtering")
context["is_searching_whole_tree"] = parent_context.get(
"is_searching_whole_tree"
)
@ -140,6 +141,7 @@ class PageTable(Table):
context["page_obj"] = parent_context.get("page_obj")
context["parent_page"] = parent_context.get("parent_page")
context["is_searching"] = parent_context.get("is_searching")
context["is_filtering"] = parent_context.get("is_filtering")
context["is_searching_whole_tree"] = parent_context.get(
"is_searching_whole_tree"
)

Wyświetl plik

@ -171,7 +171,7 @@ class BaseIndexView(GenericIndexView):
return ordering
def get_queryset(self):
if self.is_searching:
if self.is_searching or self.is_filtering:
if self.is_searching_whole_tree:
pages = Page.objects.all()
else: