Merge pull request #63 from UCL-ARC/fix/film-list-table-TC

Film pagination tweaks
UCL-ARC · Mar 8, 2024 · 701c18b · 701c18b
2 parents 1776e2f + e337554
commit 701c18b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/mod_app/templates/base.html b/mod_app/templates/base.html
@@ -65,7 +65,7 @@
                     <button id="drawer__button--close">x</button>
                     <ul class="drawer__list-nav">
                         <li>
-                            <a href="{% url 'film_list' %}">
+                            <a href="{% url 'film_list' %}?page=1">
                                 Films</a></li>
                         <li><a href="{% url 'analysis_list' %}">
                             Analyses: Critical Essays and Discussions</a></li>

diff --git a/mod_app/templates/film_list.html b/mod_app/templates/film_list.html
@@ -8,9 +8,9 @@
             List of films on this site
         </div>
         {% if is_paginated %}
-            <a href="?list=all" class="button--toggle-pagination"><button>View All</button></a>
+            <a href="{% url 'film_list' %}" class="button--toggle-pagination"><button>View All</button></a>
         {% else %}
-            <a href="{% url 'film_list' %}" class="button--toggle-pagination"><button>View by page</button></a>
+            <a href="{% url 'film_list' %}?page=1" class="button--toggle-pagination"><button>View by page</button></a>
         {% endif %}
     </div>
 

diff --git a/mod_app/views.py b/mod_app/views.py
@@ -17,22 +17,12 @@ class FilmListView(ListView):
     template_name = "film_list.html"
     paginate_by = 20
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        page = self.request.GET.get("list")
-
-        if page == "all":
-            context["object_list"] = context["film_list"] = self.model.objects.all()
-            context["is_paginated"] = False
-        return context
-
-    #     for film in context["object_list"]:
-    #         # themes = list(film.themes.all())
-    #         # film.themes = themes
-    #         # starring = list(film.cast)
-    #         # film.starring = ", ".join(str(actor) for actor in starring)
-    #         # print(starring, "film.actors", film.actors.all())
-    #     return context
+    def get_paginate_by(self, queryset):
+        page = self.request.GET.get(self.page_kwarg)
+        if page:
+            return self.paginate_by
+        else:
+            return None
 
 
 class FilmDetailView(DetailView):