From 353da224be0f392f9aa1ec90d2668d409f2259e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sun, 10 Jul 2022 22:48:45 +0200
Subject: [PATCH] Fix consists pagination and remove hardcoded urls

---
 .../migrations/0002_alter_consist_options.py   | 17 +++++++++++++++++
 ram/consist/models.py                          |  3 +++
 ram/portal/templates/base.html                 | 12 ++++++------
 ram/portal/templates/consist.html              | 10 +++++-----
 ram/portal/templates/consists.html             | 18 +++++++++---------
 ram/portal/templates/home.html                 |  6 +++---
 ram/portal/urls.py                             |  6 +++++-
 7 files changed, 48 insertions(+), 24 deletions(-)
 create mode 100644 ram/consist/migrations/0002_alter_consist_options.py

diff --git a/ram/consist/migrations/0002_alter_consist_options.py b/ram/consist/migrations/0002_alter_consist_options.py
new file mode 100644
index 0000000..b3e5239
--- /dev/null
+++ b/ram/consist/migrations/0002_alter_consist_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.0.6 on 2022-07-10 13:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('consist', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='consist',
+            options={'ordering': ['creation_time']},
+        ),
+    ]
diff --git a/ram/consist/models.py b/ram/consist/models.py
index cdd1085..3bf1d6d 100644
--- a/ram/consist/models.py
+++ b/ram/consist/models.py
@@ -27,6 +27,9 @@ class Consist(models.Model):
     def get_absolute_url(self):
         return reverse("consist", kwargs={"uuid": self.uuid})
 
+    class Meta:
+        ordering = ["creation_time"]
+
 
 class ConsistItem(models.Model):
     consist = models.ForeignKey(
diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index ae063c0..7d16270 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -34,7 +34,7 @@
     <header>
       <div class="navbar navbar-light bg-light shadow-sm">
         <div class="container">
-          <a href="/" class="navbar-brand d-flex align-items-center">
+          <a href="{% url 'index' %}" class="navbar-brand d-flex align-items-center">
             <svg class="me-2" width="26" height="16" enable-background="new 0 0 26 26" version="1" viewBox="0 0 26 16" xmlns="http://www.w3.org/2000/svg">
               <path d="m2.8125 0.0010991a1.0001 1.0001 0 0 0-0.8125 1c0 0.55455-0.44545 1-1 1a1.0001 1.0001 0 0 0-1 1v10a1.0001 1.0001 0 0 0 1 1c0.55455 0 1 0.44546 1 1a1.0001 1.0001 0 0 0 1 1h20a1.0001 1.0001 0 0 0 1-1c0-0.55454 0.44546-1 1-1a1.0001 1.0001 0 0 0 1-1v-10a1.0001 1.0001 0 0 0-1-1c-0.55454 0-1-0.44545-1-1a1.0001 1.0001 0 0 0-1-1h-20a1.0001 1.0001 0 0 0-0.09375 0 1.0001 1.0001 0 0 0-0.09375 0zm0.78125 2h14.406v1h2v-1h2.4062c0.30628 0.76906 0.82469 1.2875 1.5938 1.5938v8.8125c-0.76906 0.30628-1.2875 0.82469-1.5938 1.5938h-2.4062v-1h-2v1h-14.406c-0.30628-0.76906-0.82469-1.2875-1.5938-1.5938v-8.8125c0.76906-0.30628 1.2875-0.82469 1.5938-1.5938zm14.406 2v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" enable-background="accumulate" fill="#000" overflow="visible" stroke-width="2" style="text-indent:0;text-transform:none"/>
             </svg>
@@ -48,14 +48,14 @@
       <div class="container py-2">
         <nav class="navbar navbar-expand-lg navbar-light">
           <div class="container-fluid g-0">
-            <a class="navbar-brand" href="/">Home</a>
+              <a class="navbar-brand" href="{% url 'index' %}">Home</a>
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
               <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                 <li class="nav-item">
-                  <a class="nav-link" href="/portal">Roster</a>
+                  <a class="nav-link" href="{% url 'index' %}">Roster</a>
                 </li>
                 <li class="nav-item">
-                  <a class="nav-link" href="/portal/consist">Consists</a>
+                  <a class="nav-link" href="{% url 'consists' %}">Consists</a>
                 </li>
               </ul>
                     {% include 'includes/search.html' %}
@@ -79,7 +79,7 @@
             <div class="col">
               <div class="card shadow-sm">
                 {% for i in r.image.all %}
-                {% if i.is_thumbnail %}<a href="/portal/{{ r.uuid }}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
+                {% if i.is_thumbnail %}<a href="{{r.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
                 {% endfor %}
                 <div class="card-body">
                   <p class="card-text"><strong>{{ r }}</strong></p>
@@ -151,7 +151,7 @@
                   </table>
                   {% endif %}
                   <div class="btn-group mb-4">
-                   <a class="btn btn-sm btn-outline-primary" href="/portal/{{ r.uuid }}">Show all data</a>
+                   <a class="btn btn-sm btn-outline-primary" href="{{r.get_absolute_url}}">Show all data</a>
                     {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' r.pk %}">Edit</a>{% endif %}
                   </div>
                   <div class="d-flex justify-content-between align-items-center">
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 711ff7b..e933e42 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -16,7 +16,7 @@
       <div class="col">
         <div class="card shadow-sm">
           {% for i in r.rolling_stock.image.all %}
-          {% if i.is_thumbnail %}<a href="/portal/{{ r.rolling_stock.uuid }}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
+          {% if i.is_thumbnail %}<a href="{{r.rolling_stock.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
           {% endfor %}
           <div class="card-body">
             <p class="card-text"><strong>{{ r }}</strong></p>
@@ -88,7 +88,7 @@
               </table>
             {% endif %}
             <div class="btn-group mb-4">
-             <a class="btn btn-sm btn-outline-primary" href="/portal/{{ r.rolling_stock.uuid }}">Show all data</a>
+             <a class="btn btn-sm btn-outline-primary" href="{{r.rolling_stock.get_absolute_url}}">Show all data</a>
               {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' r.rolling_stock.pk %}">Edit</a>{% endif %}
             </div>
             <div class="d-flex justify-content-between align-items-center">
@@ -105,7 +105,7 @@
         <ul class="pagination justify-content-center mt-4">
           {% if rolling_stock.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{{ consist.get_absolute_url }}/{{ rolling_stock.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -118,12 +118,12 @@
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-            <li class="page-item"><a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ i }}#rolling-stock">{{ i }}</a></li>
+            <li class="page-item"><a class="page-link" href="{{ consist.get_absolute_url }}/{{ i }}#rolling-stock">{{ i }}</a></li>
             {% endif %}
           {% endfor %}
           {% if rolling_stock.has_next %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.next_page_number }}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{{ consist.get_absolute_url }}/{{ rolling_stock.next_page_number }}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html
index b62e53b..7d870ab 100644
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -45,7 +45,7 @@
               </tbody>
             </table>
             <div class="btn-group mb-4">
-             <a class="btn btn-sm btn-outline-primary" href="/portal/consist/{{ c.uuid }}">Show all data</a>
+             <a class="btn btn-sm btn-outline-primary" href="{{ c.get_absolute_url }}">Show all data</a>
               {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{# url 'admin:consist_consist_change' c.pk #}">Edit</a>{% endif %}
             </div>
             <div class="d-flex justify-content-between align-items-center">
@@ -57,30 +57,30 @@
       {% endfor %}
       {% endblock %}
       {% block pagination %}
-      {% if rolling_stock.has_other_pages %}
+      {% if consist.has_other_pages %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4">
-          {% if rolling_stock.has_previous %}
+          {% if consist.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'consists' %}/{{ consist.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
             <span class="page-link">Previous</span>
           </li>
           {% endif %}
-          {% for i in rolling_stock.paginator.page_range %}
-            {% if rolling_stock.number == i %}
+          {% for i in consist.paginator.page_range %}
+            {% if consist.number == i %}
             <li class="page-item active">
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-            <li class="page-item"><a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ i }}#rolling-stock">{{ i }}</a></li>
+            <li class="page-item"><a class="page-link" href="{% url 'consists' %}/{{ i }}#rolling-stock">{{ i }}</a></li>
             {% endif %}
           {% endfor %}
-          {% if rolling_stock.has_next %}
+          {% if consist.has_next %}
           <li class="page-item">
-            <a class="page-link" href="/portal/consist/{{ consist.uuid }}/{{ rolling_stock.next_page_number }}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'consists' %}/{{ consist.next_page_number }}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
diff --git a/ram/portal/templates/home.html b/ram/portal/templates/home.html
index f249b6d..1528678 100644
--- a/ram/portal/templates/home.html
+++ b/ram/portal/templates/home.html
@@ -12,7 +12,7 @@
         <ul class="pagination justify-content-center mt-4">
           {% if rolling_stock.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="/portal/{{ rolling_stock.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'index' %}{{ rolling_stock.previous_page_number }}#rolling_stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -25,12 +25,12 @@
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-            <li class="page-item"><a class="page-link" href="/portal/{{ i }}#rolling-stock">{{ i }}</a></li>
+            <li class="page-item"><a class="page-link" href="{% url 'index' %}{{ i }}#rolling-stock">{{ i }}</a></li>
             {% endif %}
           {% endfor %}
           {% if rolling_stock.has_next %}
           <li class="page-item">
-            <a class="page-link" href="/portal/{{ rolling_stock.next_page_number }}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'index' %}{{ 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 b06b83a..e3756e6 100644
--- a/ram/portal/urls.py
+++ b/ram/portal/urls.py
@@ -22,7 +22,11 @@ urlpatterns = [
         GetHomeFiltered.as_view(),
         name="search_pagination",
     ),
-    path("consist", Consists.as_view(), name="consists"),
+    path("consists", Consists.as_view(), name="consists"),
+    path(
+        "consists/<int:page>",
+        Consists.as_view(), name="consists_pagination"
+    ),
     path("consist/<uuid:uuid>", GetConsist.as_view(), name="consist"),
     path(
         "consist/<uuid:uuid>/<int:page>",