From 424b17ae58ecd4431aeb7c883b31e1b177a6d058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sun, 8 Oct 2023 09:52:38 +0200
Subject: [PATCH] Bug fixing for consists

---
 ram/portal/templates/cards/consist.html |  2 +-
 ram/portal/templates/types.html         |  6 +++---
 ram/portal/urls.py                      | 10 ++++++++--
 ram/portal/views.py                     |  7 +++----
 ram/ram/__init__.py                     |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ram/portal/templates/cards/consist.html b/ram/portal/templates/cards/consist.html
index f0f6e77..c0f4b67 100644
--- a/ram/portal/templates/cards/consist.html
+++ b/ram/portal/templates/cards/consist.html
@@ -26,7 +26,7 @@
             <table class="table table-striped">
               <thead>
                 <tr>
-                  <th colspan="2" scope="row">Consist data</th>
+                  <th colspan="2" scope="row">Consist</th>
                 </tr>
               </thead>
               <tbody class="table-group-divider">
diff --git a/ram/portal/templates/types.html b/ram/portal/templates/types.html
index 5f85b88..77565e3 100644
--- a/ram/portal/templates/types.html
+++ b/ram/portal/templates/types.html
@@ -5,7 +5,7 @@
         <ul class="pagination justify-content-center mt-4 mb-0">
           {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'scales_pagination' page=data.previous_page_number %}#main-content" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'types_pagination' page=data.previous_page_number %}#main-content" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -21,13 +21,13 @@
               {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'scales_pagination' page=i %}#main-content">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'types_pagination' page=i %}#main-content">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'scales_pagination' page=data.next_page_number %}#main-content" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'types_pagination' page=data.next_page_number %}#main-content" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
diff --git a/ram/portal/urls.py b/ram/portal/urls.py
index a62a6ac..62932b6 100644
--- a/ram/portal/urls.py
+++ b/ram/portal/urls.py
@@ -26,9 +26,15 @@ urlpatterns = [
         GetFlatpage.as_view(),
         name="flatpage",
     ),
-    path("consists", Consists.as_view(), name="consists"),
     path(
-        "consists/<int:page>", Consists.as_view(), name="consists_pagination"
+        "consists",
+        Consists.as_view(template="consists.html"),
+        name="consists"
+    ),
+    path(
+        "consists/<int:page>",
+        Consists.as_view(template="consists.html"),
+        name="consists_pagination"
     ),
     path("consist/<uuid:uuid>", GetConsist.as_view(), name="consist"),
     path(
diff --git a/ram/portal/views.py b/ram/portal/views.py
index bec4687..babd064 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -347,10 +347,9 @@ class GetRollingStock(View):
 
 
 class Consists(GetData):
-    def __init__(self):
-        self.title = "Consists"
-        self.item_type = "consist"
-        self.queryset = Consist.objects.all()
+    title = "Consists"
+    item_type = "consist"
+    queryset = Consist.objects.all()
 
 
 class GetConsist(View):
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 37c1b33..f965868 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 __version__ += git_suffix(__file__)