From ad33731913cde681cdc470c4ac10046b5dccb558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Mon, 18 Jul 2022 22:48:04 +0200
Subject: [PATCH] Fix filtered pagination

---
 ram/portal/templates/page.html   | 2 +-
 ram/portal/templates/search.html | 6 +++---
 ram/portal/urls.py               | 6 ------
 ram/portal/views.py              | 6 +++---
 ram/ram/__init__.py              | 2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html
index 714b901..45a8fbf 100644
--- a/ram/portal/templates/page.html
+++ b/ram/portal/templates/page.html
@@ -125,7 +125,7 @@
                         <td>{{ rolling_stock.sku }}</td>
                       </tr>
                       <tr>
-                        <th scope="row">ERA</th>
+                        <th scope="row">Era</th>
                         <td>{{ rolling_stock.era }}</td>
                       </tr>
                       <tr>
diff --git a/ram/portal/templates/search.html b/ram/portal/templates/search.html
index b2c39c4..60b93c9 100644
--- a/ram/portal/templates/search.html
+++ b/ram/portal/templates/search.html
@@ -10,7 +10,7 @@
         <ul class="pagination justify-content-center mt-4">
           {% if rolling_stock.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'search_pagination' search=search page=rolling_stock.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=rolling_stock.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -26,13 +26,13 @@
               {% if i == rolling_stock.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'search_pagination' search=search page=i %}#rolling-stock">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if rolling_stock.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'search_pagination' search=search page=rolling_stock.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=rolling_stock.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
diff --git a/ram/portal/urls.py b/ram/portal/urls.py
index 3ae5731..496870d 100644
--- a/ram/portal/urls.py
+++ b/ram/portal/urls.py
@@ -18,12 +18,6 @@ urlpatterns = [
         GetHomeFiltered.as_view(http_method_names=["post"]),
         name="search",
     ),
-    path("search/<str:search>", GetHomeFiltered.as_view(), name="search"),
-    path(
-        "search/<str:search>/<int:page>",
-        GetHomeFiltered.as_view(),
-        name="search_pagination",
-    ),
     path("consists", Consists.as_view(), name="consists"),
     path(
         "consists/<int:page>", Consists.as_view(), name="consists_pagination"
diff --git a/ram/portal/views.py b/ram/portal/views.py
index d624f2a..f55787e 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -50,7 +50,7 @@ class GetHome(View):
 class GetHomeFiltered(View):
     def run_search(self, request, search, _filter, page=1):
         site_conf = get_site_conf()
-        if _filter is None:
+        if _filter == "search":
             query = reduce(
                 operator.or_,
                 (
@@ -90,7 +90,7 @@ class GetHomeFiltered(View):
 
         return rolling_stock, matches, page_range
 
-    def get(self, request, search, _filter=None, page=1):
+    def get(self, request, search, _filter="search", page=1):
         rolling_stock, matches, page_range = self.run_search(
             request, search, _filter, page
         )
@@ -107,7 +107,7 @@ class GetHomeFiltered(View):
             },
         )
 
-    def post(self, request, _filter=None, page=1):
+    def post(self, request, _filter="search", page=1):
         search = request.POST.get("search")
         if not search:
             raise Http404
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 58d95ab..3b6cea5 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.0.7"
+__version__ = "0.0.8"
 __version__ += git_suffix(__file__)