Rename roster methods in portal view

Update examples to implement caching
Improve UX and filtering
2025-08-07 06:37:50 +02:00 · 2023-10-17 22:46:55 +02:00 · 2023-10-17 22:40:31 +02:00 · 2023-10-17 13:44:30 +02:00 · 2023-10-16 22:48:46 +02:00 · 2023-10-12 22:33:55 +02:00
22 changed files with 203 additions and 89 deletions
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -13,7 +13,7 @@ jobs:
    strategy:
      max-parallel: 2
      matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']

    steps:
    - uses: actions/checkout@v3
--- a/ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py
+++ b/ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2023-10-10 12:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("metadata", "0013_decoderdocument_private"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="decoder",
+            options={"ordering": ["manufacturer", "name"]},
+        ),
+        migrations.AlterModelOptions(
+            name="tag",
+            options={"ordering": ["name"]},
+        ),
+    ]
--- a/ram/metadata/models.py
+++ b/ram/metadata/models.py
@@ -95,6 +95,9 @@ class Decoder(models.Model):
        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
    )

+    class Meta(object):
+        ordering = ["manufacturer", "name"]
+
    def __str__(self):
        return "{0} - {1}".format(self.manufacturer, self.name)

@@ -163,6 +166,9 @@ class Tag(models.Model):
    name = models.CharField(max_length=128, unique=True)
    slug = models.CharField(max_length=128, unique=True)

+    class Meta(object):
+        ordering = ["name"]
+
    def __str__(self):
        return self.name

--- a/ram/portal/static/css/main.css
+++ b/ram/portal/static/css/main.css
@@ -7,6 +7,16 @@ html[data-bs-theme='dark'] .navbar svg {
  width: 100%;
 }

+td > img.logo {
+  max-width: 200px;
+  max-height: 48px;
+}
+
+td > img.logo-xl {
+  max-width: 400px;
+  max-height: 96px;
+}
+
 .btn > span {
  display: inline-block;
 }
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -121,7 +121,7 @@
  </head>
  <body>
    <header>
-      <nav class="navbar navbar-expand-lg bg-body-tertiary shadow-sm">
+      <nav class="navbar navbar-expand-sm bg-body-tertiary shadow-sm">
        <div class="container d-flex">
          <div class="me-auto">
            <a href="{% url 'index' %}" class="navbar-brand d-flex align-items-center">
@@ -146,29 +146,30 @@
        <nav class="navbar navbar-expand-lg">
          <div class="container-fluid g-0">
            <a class="navbar-brand" href="{% url 'index' %}">Home</a>
-            <div class="navbar-collapse" id="navbarSupportedContent">
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
              <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                <li class="nav-item dropdown">
-                  <a class="nav-link dropdown-toggle" href="#" id="rosterDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                    Roster
-                  </a>
-                  <ul class="dropdown-menu" aria-labelledby="rosterDropdownMenu">
-                    <li><a class="dropdown-item" href="{% url 'roster' %}">Rolling stock</a></li>
-                    <li><a class="dropdown-item" href="{% url 'companies' %}">Companies</a></li>
-                    <li><a class="dropdown-item" href="{% url 'types' %}">Types</a></li>
-                    <li><a class="dropdown-item" href="{% url 'scales' %}">Scales</a></li>
-                  </ul>
+                <li class="nav-item">
+                  <a class="nav-link" href="{% url 'roster' %}">Roster</a>
                </li>
                <li class="nav-item">
                  <a class="nav-link" href="{% url 'consists' %}">Consists</a>
                </li>
                <li class="nav-item dropdown">
-                  <a class="nav-link dropdown-toggle" href="#" id="manufacturersDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                    Manufacturers
+                  <a class="nav-link dropdown-toggle" href="#" id="filterDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    Search by
                  </a>
-                  <ul class="dropdown-menu" aria-labelledby="manufacturersDropdownMenu">
-                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='model' %}">Models</a></li>
-                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Real</a></li>
+                  <ul class="dropdown-menu" aria-labelledby="filterDropdownMenu">
+                    <li class="ps-2 text-secondary">Model</li>
+                    <li><a class="dropdown-item" href="{% url 'scales' %}">Scale</a></li>
+                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='model' %}">Manufacturer</a></li>
+                    <li><hr class="dropdown-divider"></li>
+                    <li class="ps-2 text-secondary">Prototype</li>
+                    <li><a class="dropdown-item" href="{% url 'types' %}">Type</a></li>
+                    <li><a class="dropdown-item" href="{% url 'companies' %}">Company</a></li>
+                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Manufacturer</a></li>
                  </ul>
                </li>
                {% show_bookshelf_menu %}
--- a/ram/portal/templates/cards.html
+++ b/ram/portal/templates/cards.html
@@ -3,11 +3,11 @@
        <p class="lead text-muted">Results found: {{ matches }}</p>
      {% endblock %}
      {% block cards_layout %}
-      <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
+      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
      {% block cards %}
        {% for d in data %}
        {% if d.type == "rolling_stock" %}
-        {% include "cards/rolling_stock.html" %}
+        {% include "cards/roster.html" %}
        {% elif d.type == "company" %}
        {% include "cards/company.html" %}
        {% elif d.type == "rolling_stock_type" %}
--- a/ram/portal/templates/cards/book.html
+++ b/ram/portal/templates/cards/book.html
@@ -1,11 +1,7 @@
        <div class="col">
          <div class="card shadow-sm">
-            {% if d.item.image.all %}
-            <a href="{{ d.item.get_absolute_url }}">
-              {% for r in d.item.image.all %}
-                {% if forloop.first %}<img src="{{ r.image.url }}" alt="Card image cap">{% endif %}
-              {% endfor %}
-              </a>
+            {% if d.item.image.exists %}
+            <a href="{{d.item.get_absolute_url}}"><img class="card-img-top" src="{{ d.item.image.first.image.url }}" alt="{{ d }}"></a>
            {% endif %}
            <div class="card-body">
              <p class="card-text" style="position: relative;">
--- a/ram/portal/templates/cards/company.html
+++ b/ram/portal/templates/cards/company.html
@@ -14,7 +14,7 @@
                {% if d.item.logo %}
                <tr>
                  <th class="w-33" scope="row">Logo</th>
-                  <td><img style="max-height: 48px" src="{{ d.item.logo.url }}" /></td>
+                  <td><img class="logo" src="{{ d.item.logo.url }}" /></td>
                </tr>
                {% endif %}
                <tr>
--- a/ram/portal/templates/cards/consist.html
+++ b/ram/portal/templates/cards/consist.html
@@ -2,12 +2,10 @@
        <div class="card shadow-sm">
          <a href="{{ d.item.get_absolute_url }}">
          {% if d.item.image %}
-            <img src="{{ d.item.image.url }}" alt="Card image cap">
+            <img class="card-img-top" src="{{ d.item.image.url }}" alt="{{ d }}">
          {% else %}
            {% with d.item.consist_item.first.rolling_stock as r %}
-            {% for i in r.image.all %}
-              {% if forloop.first %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
-            {% endfor %}
+            <img class="card-img-top" src="{{ r.image.first.image.url }}" alt="{{ d }}"></a>
            {% endwith %}
          {% endif %}
          </a>
@@ -46,7 +44,7 @@
                </tr>
                <tr>
                  <th scope="row">Length</th>
-                  <td>{{ d.item.consist_item.all | length }}</td>
+                  <td>{{ d.item.consist_item.count }}</td>
                </tr>
              </tbody>
            </table>
--- a/ram/portal/templates/cards/manufacturer.html
+++ b/ram/portal/templates/cards/manufacturer.html
@@ -14,7 +14,7 @@
                  {% if d.item.logo %}
                  <tr>
                    <th class="w-33" scope="row">Logo</th>
-                    <td><img style="max-height: 48px" src="{{ d.item.logo.url }}" /></td>
+                    <td><img class="logo" src="{{ d.item.logo.url }}" /></td>
                  </tr>
                  {% endif %}
                  {% if d.item.website %}
--- a/ram/portal/templates/cards/rolling_stock.html
+++ b/ram/portal/templates/cards/rolling_stock.html
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -81,7 +81,9 @@
                  <tbody class="table-group-divider">
                    <tr>
                      <th class="w-33" scope="row">Company</th>
-                      <td><abbr title="{{ consist.company.extended_name }}">{{ consist.company }}</abbr></td>
+                      <td>
+                        <a href="{% url 'filtered' _filter="company" search=consist.company.slug %}">{{ consist.company }}</a> ({{ consist.company.extended_name }})
+                      </td>
                    </tr>
                    <tr>
                      <th scope="row">Era</th>
--- a/ram/portal/templates/includes/login.html
+++ b/ram/portal/templates/includes/login.html
@@ -1,4 +1,7 @@
-      <div class="navbar-collapse justify-content-end" id="loginNavbar">
+     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#loginNavbar" aria-controls="loginNavbar" aria-expanded="false" aria-label="Toggle navigation">
+     <span class="bi bi-person-fill-gear"></span>
+     </button>
+      <div class="collapse navbar-collapse justify-content-end" id="loginNavbar">
        <ul class="navbar-nav">
          <li class="nav-item dropdown">
            {% if request.user.is_staff %}
@@ -14,7 +17,6 @@
              <li><hr class="dropdown-divider"></li>
              <li><a class="dropdown-item" href="{% url 'admin:index' %}">Admin</a></li>
              <li><a class="dropdown-item" href="{% url 'admin:portal_siteconfiguration_changelist' %}">Site configuration</a></li>
-              <li><a class="dropdown-item" href="{% url 'admin:driver_driverconfiguration_changelist' %}">DCC configuration</a></li>
              <li><hr class="dropdown-divider"></li>
              <li><a class="dropdown-item text-danger" href="{% url 'admin:logout' %}?next={{ request.path }}">Logout</a></li>
            </ul>
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -45,13 +45,16 @@
            <div class="mx-auto">
              <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
                <button class="nav-link active" id="nav-summary-tab" data-bs-toggle="tab" data-bs-target="#nav-summary" type="button" role="tab" aria-controls="nav-summary" aria-selected="true">Summary</button>
-                <button class="nav-link" id="nav-model-tab" data-bs-toggle="tab" data-bs-target="#nav-model" type="button" role="tab" aria-controls="nav-model" aria-selected="false">Model data</button>
-                <button class="nav-link" id="nav-class-tab" data-bs-toggle="tab" data-bs-target="#nav-class" type="button" role="tab" aria-controls="nav-class" aria-selected="false">Class data</button>
+                <button class="nav-link" id="nav-model-tab" data-bs-toggle="tab" data-bs-target="#nav-model" type="button" role="tab" aria-controls="nav-model" aria-selected="false">Model</button>
+                <button class="nav-link" id="nav-class-tab" data-bs-toggle="tab" data-bs-target="#nav-class" type="button" role="tab" aria-controls="nav-class" aria-selected="false">Class</button>
+                <button class="nav-link" id="nav-company-tab" data-bs-toggle="tab" data-bs-target="#nav-company" type="button" role="tab" aria-controls="nav-company" aria-selected="false">Company</button>
                {% if rolling_stock.decoder %}<button class="nav-link" id="nav-dcc-tab" data-bs-toggle="tab" data-bs-target="#nav-dcc" type="button" role="tab" aria-controls="nav-dcc" aria-selected="false">DCC</button>{% endif %}
                {% if documents or decoder_documents %}<button class="nav-link" id="nav-documents-tab" data-bs-toggle="tab" data-bs-target="#nav-documents" type="button" role="tab" aria-controls="nav-documents" aria-selected="false">Documents</button>{% endif %}
                {% if journal %}<button class="nav-link" id="nav-journal-tab" data-bs-toggle="tab" data-bs-target="#nav-journal" type="button" role="tab" aria-controls="nav-journal" aria-selected="false">Journal</button>{% endif %}
                {% if rolling_stock.notes %}<button class="nav-link" id="nav-notes-tab" data-bs-toggle="tab" data-bs-target="#nav-notes" type="button" role="tab" aria-controls="nav-notes" aria-selected="false">Notes</button>{% endif %}
+                {% if consists %}<button class="nav-link" id="nav-consists-tab" data-bs-toggle="tab" data-bs-target="#nav-consists" type="button" role="tab" aria-controls="nav-consists" aria-selected="false">Consists</button>{% endif %}
              </nav>
+              {% with class=rolling_stock.rolling_class company=rolling_stock.rolling_class.company %}
              <div class="tab-content" id="nav-tabContent">
                <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                  <table class="table table-striped">
@@ -63,17 +66,17 @@
                    <tbody class="table-group-divider">
                      <tr>
                        <th class="w-33" scope="row">Type</th>
-                        <td>{{ rolling_stock.rolling_class.type }}</td>
+                        <td>{{ class.type }}</td>
                      </tr>
                      <tr>
                        <th scope="row">Company</th>
                        <td>
-                            <a href="{% url 'filtered' _filter="company" search=rolling_stock.rolling_class.company.slug %}"><abbr title="{{ rolling_stock.rolling_class.company.extended_name }}">{{ rolling_stock.rolling_class.company }}</abbr></a>
+                            <a href="{% url 'filtered' _filter="company" search=company.slug %}">{{ company }}</a> ({{ company.extended_name }})
                        </td>
                      </tr>
                      <tr>
                        <th scope="row">Class</th>
-                        <td>{{ rolling_stock.rolling_class.identifier }}</td>
+                        <td>{{ class.identifier }}</td>
                      </tr>
                      <tr>
                        <th scope="row">Road number</th>
@@ -198,26 +201,16 @@
                    <tbody class="table-group-divider">
                      <tr>
                        <th class="w-33" scope="row">Class</th>
-                        <td>{{ rolling_stock.rolling_class.identifier }}</td>
+                        <td>{{ class.identifier }}</td>
                      </tr>
                      <tr>
                        <th scope="row">Type</th>
-                        <td>{{ rolling_stock.rolling_class.type }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Company</th>
-                        <td>
-                            <a href="{% url 'filtered' _filter="company" search=rolling_stock.rolling_class.company.slug %}">{{ rolling_stock.rolling_class.company }}</a> ({{ rolling_stock.rolling_class.company.extended_name }})
-                        </td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Country</th>
-                        <td>{{ rolling_stock.rolling_class.company.country.name }}</td>
+                        <td>{{ class.type }}</td>
                      </tr>
                      <tr>
                        <th scope="row">Manufacturer</th>
-                        <td>{%if rolling_stock.rolling_class.manufacturer %}
-                          <a href="{% url 'filtered' _filter="manufacturer" search=rolling_stock.rolling_class.manufacturer.slug %}">{{ rolling_stock.rolling_class.manufacturer }}{% if rolling_stock.rolling_class.manufacturer.website %}</a> <a href="{{ rolling_stock.rolling_class.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                        <td>{%if class.manufacturer %}
+                          <a href="{% url 'filtered' _filter="manufacturer" search=class.manufacturer.slug %}">{{ class.manufacturer }}{% if class.manufacturer.website %}</a> <a href="{{ class.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                        {% endif %}</td>
                      </tr>
                    </tbody>
@@ -240,11 +233,42 @@
                  </table>
                  {% endif %}
                </div>
+                <div class="tab-pane" id="nav-company" role="tabpanel" aria-labelledby="nav-company-tab">
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Company data</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                      {% if company.logo %}
+                      <tr>
+                        <th class="w-33" scope="row">Logo</th>
+                        <td><img class="logo-xl" src="{{ company.logo.url }}" /></td>
+                      </tr>
+                      {% endif %}
+                      <tr>
+                        <th class="w-33" scope="row">Name</th>
+                        <td><a href="{% url 'filtered' _filter="company" search=company.slug %}">{{ company.name }}</a> ({{ company.extended_name }})</td>
+                      </tr>
+                      <tr>
+                        <th class="w-33" scope="row">Country</th>
+                        <td>{{ company.country.name }} <img src="{{ company.country.flag }}" alt="{{ company.country }}" />
+                      </tr>
+                      {% if company.freelance %}
+                      <tr>
+                        <th class="w-33" scope="row">Notes</th>
+                        <td>A <em>freelance</em> company</td>
+                      </tr>
+                      {% endif %}
+                    </tbody>
+                  </table>
+                </div>
                <div class="tab-pane" id="nav-dcc" role="tabpanel" aria-labelledby="nav-dcc-tab">
                  <table class="table table-striped">
                    <thead>
                      <tr>
-                        <th colspan="2" scope="row">DCC data</th>
+                        <th colspan="2" scope="row">Decoder data</th>
                      </tr>
                    </thead>
                    <tbody class="table-group-divider">
@@ -333,7 +357,15 @@
                <div class="tab-pane" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
                  {{ rolling_stock.notes | safe }}
                </div>
+                <div class="tab-pane" id="nav-consists" role="tabpanel" aria-labelledby="nav-cosists-tab">
+                  <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3 mb-3">
+                  {% for d in consists %}
+                  {% include "cards/consist.html" %}
+                  {% endfor %}
                  </div>
+                </div>
+              </div>
+              {% endwith %}
              <div class="d-grid gap-2 d-md-flex justify-content-md-end">
                {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' rolling_stock.pk %}">Edit</a>{% endif %}
              </div>
--- a/ram/portal/urls.py
+++ b/ram/portal/urls.py
@@ -3,7 +3,7 @@ from django.urls import path
 from portal.views import (
    GetData,
    GetRoster,
-    GetRosterFiltered,
+    GetObjectsFiltered,
    GetFlatpage,
    GetRollingStock,
    GetConsist,
@@ -14,7 +14,7 @@ from portal.views import (
    Types,
    Books,
    GetBook,
-    SearchRoster,
+    SearchObjects,
 )

 urlpatterns = [
@@ -95,22 +95,22 @@ urlpatterns = [
    path("bookshelf/book/<uuid:uuid>", GetBook.as_view(), name="book"),
    path(
        "search",
-        SearchRoster.as_view(http_method_names=["post"]),
+        SearchObjects.as_view(http_method_names=["post"]),
        name="search",
    ),
    path(
        "search/<str:search>/<int:page>",
-        SearchRoster.as_view(),
+        SearchObjects.as_view(),
        name="search_pagination",
    ),
    path(
        "<str:_filter>/<str:search>",
-        GetRosterFiltered.as_view(),
+        GetObjectsFiltered.as_view(),
        name="filtered",
    ),
    path(
        "<str:_filter>/<str:search>/<int:page>",
-        GetRosterFiltered.as_view(),
+        GetObjectsFiltered.as_view(),
        name="filtered_pagination",
    ),
    path("<uuid:uuid>", GetRollingStock.as_view(), name="rolling_stock"),
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -78,12 +78,12 @@ class GetData(View):


 class GetRoster(GetData):
-    title = "Rolling stock"
+    title = "Roster"
    item_type = "rolling_stock"
    queryset = RollingStock.objects.order_by(*order_by_fields())


-class SearchRoster(View):
+class SearchObjects(View):
    def run_search(self, request, search, _filter, page=1):
        site_conf = get_site_conf()
        if _filter is None:
@@ -215,15 +215,17 @@ class SearchRoster(View):
        return self.get(request, search, page)


-class GetRosterFiltered(View):
+class GetObjectsFiltered(View):
    def run_filter(self, request, search, _filter, page=1):
        site_conf = get_site_conf()
+
        if _filter == "type":
-            title = RollingStockType.objects.get(slug__iexact=search)
+            title = get_object_or_404(RollingStockType, slug__iexact=search)
            query = Q(rolling_class__type__slug__iexact=search)
        elif _filter == "company":
            title = get_object_or_404(Company, slug__iexact=search)
            query = Q(rolling_class__company__slug__iexact=search)
+            query_2nd = Q(company__slug__iexact=search)
        elif _filter == "manufacturer":
            title = get_object_or_404(Manufacturer, slug__iexact=search)
            query = Q(
@@ -233,9 +235,13 @@ class GetRosterFiltered(View):
        elif _filter == "scale":
            title = get_object_or_404(Scale, slug__iexact=search)
            query = Q(scale__slug__iexact=search)
+            query_2nd = Q(
+                consist_item__rolling_stock__scale__slug__iexact=search
+            )
        elif _filter == "tag":
            title = get_object_or_404(Tag, slug__iexact=search)
            query = Q(tags__slug__iexact=search)
+            query_2nd = query  # For tags the 2nd level query doesn't change
        else:
            raise Http404

@@ -252,9 +258,9 @@ class GetRosterFiltered(View):
                "item": item
            })

-        if _filter == "tag":
+        try:  # Execute only if query_2nd is defined
            consists = (
-                Consist.objects.filter(query)
+                Consist.objects.filter(query_2nd)
                .distinct()
            )
            for item in consists:
@@ -262,8 +268,9 @@ class GetRosterFiltered(View):
                    "type": "consist",
                    "item": item
                })
+            if _filter == "tag":  # Books can be filtered only by tag
                books = (
-                Book.objects.filter(query)
+                    Book.objects.filter(query_2nd)
                    .distinct()
                )
                for item in books:
@@ -271,6 +278,8 @@ class GetRosterFiltered(View):
                        "type": "book",
                        "item": item
                    })
+        except NameError:
+            pass

        paginator = Paginator(data, site_conf.items_per_page)
        data = paginator.get_page(page)
@@ -331,6 +340,13 @@ class GetRollingStock(View):
                    private=False
                )

+        consists = [{
+            "type": "consist",
+            "item": c
+        } for c in Consist.objects.filter(
+            consist_item__rolling_stock=rolling_stock
+        )]  # A dict with "item" is required by the consists card
+
        return render(
            request,
            "rollingstock.html",
@@ -342,6 +358,7 @@ class GetRollingStock(View):
                "decoder_documents": decoder_documents,
                "documents": documents,
                "journal": journal,
+                "consists": consists,
            },
        )

@@ -444,14 +461,15 @@ class GetBook(View):

 class GetFlatpage(View):
    def get(self, request, flatpage):
+        _filter = Q(published=True)  # Show only published pages
+        if request.user.is_authenticated:
+            _filter = Q()  # Reset the filter if user is authenticated
+
        try:
-            flatpage = Flatpage.objects.get(path=flatpage)
+            flatpage = Flatpage.objects.filter(_filter).get(path=flatpage)
        except ObjectDoesNotExist:
            raise Http404

-        if not request.user.is_authenticated:
-            flatpage = flatpage.filter(published=False)
-
        return render(
            request,
            "flatpages/flatpage.html",
--- a/ram/ram/init.py
+++ b/ram/ram/init.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix

-__version__ = "0.6.5"
+__version__ = "0.9.0"
 __version__ += git_suffix(__file__)
--- a/ram/ram/local_settings.py.tmpl
+++ b/ram/ram/local_settings.py.tmpl
@@ -1,7 +1,8 @@
 # vim: syntax=python
+from django.conf import settings

 """
-Django local_settings for ram project.
+Example of changes suitable for production
 """

 # SECURITY WARNING: keep the secret key used in production secret!
@@ -12,9 +13,23 @@ SECRET_KEY = (
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False

+# SECURITY WARNING: cache middlewares must be loaded before cookies one
+MIDDLEWARE = [
+    "django.middleware.cache.UpdateCacheMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.cache.FetchFromCacheMiddleware",
+] + settings.MIDDLEWARE
+
+CACHES = {
+    "default": {
+        "BACKEND": "django.core.cache.backends.redis.RedisCache",
+        "LOCATION": "redis://127.0.0.1:6379",
+    }
+}
+
+CACHE_MIDDLEWARE_SECONDS = 300
 STORAGE_DIR = BASE_DIR / "storage"
-ALLOWED_HOSTS = ["127.0.0.1"]
+ALLOWED_HOSTS = ["127.0.0.1", "myhost"]
 CSRF_TRUSTED_ORIGINS = ["https://myhost"]
-ROOT_URLCONF = "ram.urls"
 STATIC_URL = "static/"
 MEDIA_URL = "media/"
--- a/ram/ram/settings.py
+++ b/ram/ram/settings.py
@@ -51,7 +51,7 @@ INSTALLED_APPS = [
    "rest_framework",
    "ram",
    "portal",
-    "driver",
+    # "driver",
    "metadata",
    "roster",
    "consist",
--- a/ram/ram/urls.py
+++ b/ram/ram/urls.py
@@ -13,6 +13,7 @@ Including another URLconf
    1. Import the include() function: from django.urls import include, path
    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.apps import apps
 from django.conf import settings
 from django.shortcuts import redirect
 from django.conf.urls.static import static
@@ -27,10 +28,15 @@ urlpatterns = [
    path("admin/", admin.site.urls),
    path("api/v1/consist/", include("consist.urls")),
    path("api/v1/roster/", include("roster.urls")),
-    path("api/v1/dcc/", include("driver.urls")),
    path("api/v1/bookshelf/", include("bookshelf.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

+# Enable the "/dcc" routing only if the "driver" app is active
+if apps.is_installed("driver"):
+    urlpatterns += [
+        path("api/v1/dcc/", include("driver.urls")),
+    ]
+
 if settings.DEBUG:
    from django.views.generic import TemplateView
    from rest_framework.schemas import get_schema_view
@@ -54,3 +60,7 @@ if settings.DEBUG:
            name="openapi-schema",
        ),
    ]
+    if apps.is_installed("debug_toolbar"):
+        urlpatterns += [
+            path("__debug__/", include("debug_toolbar.urls")),
+        ]
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1 +1,2 @@
 gunicorn
+pylibmc
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,5 +8,8 @@ django-countries
 django-health-check
 django-admin-sortable2
 django-ckeditor
-# psycopg2-binary
-pySerial
+# Optional: # psycopg2-binary
+# Optional: # pySerial
+# Required by django-countries and not always installed
+# by default on modern venvs (like Python 3.12 on Fedora 39)
+setuptools
Author	SHA1	Message	Date
Daniele Viganò	c7fa54e90e	Rename roster methods in portal view	2023-10-17 22:46:55 +02:00
Daniele Viganò	9164ba494f	Update examples to implement caching	2023-10-17 22:40:31 +02:00
Daniele Viganò	97989c3384	Improve UX and filtering	2023-10-17 13:44:30 +02:00
Daniele Viganò	7865bf04f0	Add consists view in rolling stock and them in company filter	2023-10-16 22:48:46 +02:00
Daniele Viganò	e6f1480894	Change login menu icon on mobile	2023-10-12 22:33:55 +02:00
Daniele Viganò	8d8ede4c06	Improve page layout on mobile	2023-10-11 22:39:29 +02:00
Daniele Viganò	87e1107156	Bugfixing (#27 ) * Enforce ordering on some metadata models * Fix a 500 error while accessing flat pages * Clean up HTML and fix cards (missing class) * Make the "driver" app optional and disabled by default	2023-10-10 22:17:21 +02:00
Daniele Viganò	448ecae070	Add Python 3.12 flow	2023-10-09 23:17:00 +02:00
Daniele Viganò	2b0fdc4487	Workaround for python 3.12 on Fedora 39	2023-10-09 23:16:06 +02:00