Fix chooser modal filtering by type during pagination changes and search

Author: WilliamHenryTanza

src/wagtailmedia/models.py

@@ -76,6 +76,7 @@ class AbstractMedia(CollectionMember, index.Indexed, models.Model):
             ],
         ),
         index.FilterField("uploaded_by_user"),
+        index.FilterField("type"),
     ]
 
     admin_form_fields = (

src/wagtailmedia/templates/wagtailmedia/chooser/chooser.html

@@ -41,7 +41,7 @@
 
     <div class="tab-content">
         <section id="tab-search" class="w-tabs__panel" role="tabpanel" aria-labelledby="tab-label-search">
-            <form action="{% url 'wagtailmedia:chooser' %}" method="GET" role="search" class="media-search search-bar" novalidate data-chooser-modal-search>
+            <form action="{{ chooser_url }}" method="GET" role="search" class="media-search search-bar" novalidate data-chooser-modal-search>
                 <ul class="fields">
                     {% for field in searchform %}
                         <li>{% include "wagtailadmin/shared/field.html" with field=field only %}</li>

src/wagtailmedia/templates/wagtailmedia/chooser/results.html

@@ -14,7 +14,7 @@ <h2>{% trans "Latest media" %}</h2>
 
     {% include "wagtailmedia/media/list.html" with choosing=1 %}
 
-    {% include pagination_template with items=media_files link_url=link_url %}
+    {% include "wagtailadmin/shared/pagination_nav.html" with items=media_files linkurl=chooser_url %}
 {% else %}
     {% if is_searching %}
         <p>{% blocktrans %}Sorry, no media files match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>

src/wagtailmedia/views/chooser.py

@@ -15,7 +15,6 @@
 from wagtailmedia.utils import paginate
 
 
-pagination_template = "wagtailadmin/shared/pagination_nav.html"
 permission_checker = PermissionPolicyChecker(permission_policy)
 
 
@@ -73,6 +72,9 @@ def chooser(request, media_type=None):
 
     if media_type:
         media_files = media_files.filter(type=media_type)
+        chooser_url = reverse("wagtailmedia:chooser_typed", args=(media_type,))
+    else:
+        chooser_url = reverse("wagtailmedia:chooser")
 
     if (
         "q" in request.GET
@@ -109,10 +111,9 @@ def chooser(request, media_type=None):
                 "media_files": media_files,
                 "query_string": q,
                 "is_searching": is_searching,
-                "pagination_template": pagination_template,
                 "media_type": media_type,
                 "ordering": ordering,
-                "linkurl": reverse("wagtailmedia:chooser"),
+                "chooser_url": chooser_url,
                 "elided_page_range": paginator.get_elided_page_range(
                     request.GET.get("p", 1)
                 ),
@@ -145,13 +146,12 @@ def chooser(request, media_type=None):
             "collections": collections,
             "uploadforms": uploadforms,
             "is_searching": False,
-            "pagination_template": pagination_template,
             "popular_tags": popular_tags_for_model(Media),
             "media_type": media_type,
             "ordering": ordering,
             "title": title,
             "icon": f"wagtailmedia-{media_type}" if media_type is not None else "media",
-            "linkurl": reverse("wagtailmedia:chooser"),
+            "chooser_url": chooser_url,
             "elided_page_range": paginator.get_elided_page_range(
                 request.GET.get("p", 1)
             ),
@@ -241,15 +241,14 @@ def chooser_upload(request, media_type):
         collections = None
 
     media_files = media_files.order_by(ordering)
-    paginator, media_files = paginate(request, media_files, per_page=10)
+    paginator, media_files = paginate(request, media_files)
 
     context = {
         "media_files": media_files,
         "searchform": searchform,
         "collections": collections,
         "uploadforms": upload_forms,
         "is_searching": False,
-        "pagination_template": pagination_template,
         "media_type": media_type,
         "ordering": ordering,
     }