Bump to v0.19.8

docs/nginx/nginx.conf

@@ -0,0 +1,43 @@
+server {
+    listen       [::]:443 ssl;
+    listen       443 ssl;
+    server_name  myhost;
+
+    # ssl_certificate ...;
+
+    add_header X-Xss-Protection "1; mode=block";
+    add_header Strict-Transport-Security "max-age=15768000";
+    add_header Permissions-Policy "geolocation=(),midi=(),sync-xhr=(),microphone=(),camera=(),magnetometer=(),gyroscope=(),fullscreen=(self),payment=()";
+    add_header Content-Security-Policy "child-src 'none'; object-src 'none'";
+
+    client_max_body_size 250M;
+    error_page  403 404 https://$server_name/404;
+
+    location / {
+        proxy_pass               http://127.0.0.1:8000;
+        proxy_set_header         Host              $host;
+        proxy_set_header         X-Real-IP         $remote_addr;
+        proxy_set_header         X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header         X-Forwarded-Proto $scheme;
+        proxy_redirect           http:// https://;
+        proxy_connect_timeout    1800;
+        proxy_read_timeout       1800;
+        proxy_max_temp_file_size 8192m;
+    }
+
+    # static files
+    location /static {
+        root /myroot/ram/storage;
+    }
+
+    # media files
+    location ~ ^/media/(images|uploads) {
+        root /myroot/ram/storage;
+    }
+
+    # protected filed to be served via X-Accel-Redirect
+    location /private {
+    	internal;
+        alias /myroot/ram/storage/media;
+    }
+}

ram/bookshelf/admin.py

@@ -59,20 +59,34 @@ class MagazineIssueDocInline(BookDocInline):
     model = MagazineIssueDocument
 
 
+class BookTocInline(admin.TabularInline):
+    model = TocEntry
+    min_num = 0
+    extra = 0
+    fields = (
+        "title",
+        "subtitle",
+        "authors",
+        "page",
+        "featured",
+    )
+
+
 @admin.register(Book)
 class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
+        BookTocInline,
         BookPropertyInline,
         BookImageInline,
         BookDocInline,
     )
     list_display = (
-        "published",
         "title",
         "get_authors",
         "get_publisher",
         "publication_year",
         "number_of_pages",
+        "published",
     )
     autocomplete_fields = ("authors", "publisher", "shop")
     readonly_fields = ("invoices", "creation_time", "updated_time")
@@ -364,23 +378,10 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
     actions = [publish, unpublish, download_csv]
 
 
-class MagazineIssueToc(admin.TabularInline):
-    model = TocEntry
-    min_num = 0
-    extra = 0
-    fields = (
-        "title",
-        "subtitle",
-        "authors",
-        "page",
-        "featured",
-    )
-
-
 @admin.register(MagazineIssue)
 class MagazineIssueAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
-        MagazineIssueToc,
+        BookTocInline,
         BookPropertyInline,
         BookImageInline,
         MagazineIssueDocInline,

ram/bookshelf/migrations/0031_alter_tocentry_authors_alter_tocentry_subtitle_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 6.0 on 2025-12-31 13:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0030_tocentry"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tocentry",
+            name="authors",
+            field=models.CharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name="tocentry",
+            name="subtitle",
+            field=models.CharField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name="tocentry",
+            name="title",
+            field=models.CharField(),
+        ),
+    ]

ram/bookshelf/models.py

@@ -254,9 +254,9 @@ class TocEntry(BaseModel):
     book = models.ForeignKey(
         BaseBook, on_delete=models.CASCADE, related_name="toc"
     )
-    title = models.CharField(max_length=200)
-    subtitle = models.CharField(max_length=200, blank=True)
-    authors = models.CharField(max_length=256, blank=True)
+    title = models.CharField()
+    subtitle = models.CharField(blank=True)
+    authors = models.CharField(blank=True)
     page = models.SmallIntegerField()
     featured = models.BooleanField(
         default=False,
@@ -268,9 +268,15 @@ class TocEntry(BaseModel):
         verbose_name_plural = "Table of Contents Entries"
 
     def __str__(self):
-        return f"{self.title} (p. {self.page})"
+        if self.subtitle:
+            title = f"{self.title}: {self.subtitle}"
+        else:
+            title = self.title
+        return f"{title} (p. {self.page})"
 
     def clean(self):
+        if self.page is None:
+            raise ValidationError("Page number is required.")
         if self.page < 1:
             raise ValidationError("Page number is invalid.")
         try:

ram/consist/migrations/0019_consistitem_load.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0 on 2026-01-03 12:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("consist", "0018_alter_consist_scale"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="consistitem",
+            name="load",
+            field=models.BooleanField(default=False),
+        ),
+    ]

ram/consist/models.py

@@ -43,10 +43,10 @@ class Consist(BaseModel):
 
     @property
     def length(self):
-        return self.consist_item.count()
+        return self.consist_item.filter(load=False).count()
 
     def get_type_count(self):
-        return self.consist_item.annotate(
+        return self.consist_item.filter(load=False).annotate(
             type=models.F("rolling_stock__rolling_class__type__type")
         ).values(
             "type"
@@ -56,6 +56,15 @@ class Consist(BaseModel):
             order=models.Max("order"),
         ).order_by("order")
 
+    def get_cover(self):
+        if self.image:
+            return self.image
+        else:
+            consist_item = self.consist_item.first()
+            if consist_item and consist_item.rolling_stock.image.exists():
+                return consist_item.rolling_stock.image.first().image
+        return None
+
     @property
     def country(self):
         return self.company.country
@@ -69,6 +78,7 @@ class ConsistItem(models.Model):
         Consist, on_delete=models.CASCADE, related_name="consist_item"
     )
     rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
+    load = models.BooleanField(default=False)
     order = models.PositiveIntegerField(blank=False, null=False)
 
     class Meta:
@@ -92,10 +102,15 @@ class ConsistItem(models.Model):
         # because the consist is not saved yet and it must be moved
         # to the admin form validation via InlineFormSet.clean()
         consist = self.consist
-        if rolling_stock.scale != consist.scale:
+        # Scale must match, but allow loads of any scale
+        if rolling_stock.scale != consist.scale and not self.load:
             raise ValidationError(
                 "The rolling stock and consist must be of the same scale."
             )
+        if self.load and rolling_stock.scale.ratio != consist.scale.ratio:
+            raise ValidationError(
+                "The load and consist must be of the same scale ratio."
+            )
         if self.consist.published and not rolling_stock.published:
             raise ValidationError(
                 "You must unpublish the the consist before using this item."

ram/portal/admin.py

@@ -20,6 +20,7 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                     "about",
                     "items_per_page",
                     "items_ordering",
+                    "featured_items_ordering",
                     "currency",
                     "footer",
                     "footer_extended",

ram/portal/migrations/0021_siteconfiguration_featured_items_ordering_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 6.0 on 2026-01-02 23:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("portal", "0020_alter_flatpage_options"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="siteconfiguration",
+            name="featured_items_ordering",
+            field=models.CharField(
+                choices=[
+                    ("type", "By rolling stock type and company"),
+                    ("class", "By rolling stock type and class"),
+                    ("company", "By company and type"),
+                    ("country", "By country and type"),
+                    ("cou+com", "By country and company"),
+                ],
+                default="type",
+                max_length=11,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="siteconfiguration",
+            name="items_ordering",
+            field=models.CharField(
+                choices=[
+                    ("type", "By rolling stock type and company"),
+                    ("class", "By rolling stock type and class"),
+                    ("company", "By company and type"),
+                    ("country", "By country and type"),
+                    ("cou+com", "By country and company"),
+                ],
+                default="type",
+                max_length=11,
+            ),
+        ),
+    ]

ram/portal/models.py

@@ -22,14 +22,17 @@ class SiteConfiguration(SingletonModel):
         default="6",
     )
     items_ordering = models.CharField(
-        max_length=10,
+        max_length=11,
         choices=[
-            ("type", "By rolling stock type"),
-            ("company", "By company name"),
-            ("identifier", "By rolling stock class"),
+            ("type", "By rolling stock type and company"),
+            ("class", "By rolling stock type and class"),
+            ("company", "By company and type"),
+            ("country", "By country and type"),
+            ("cou+com", "By country and company"),
         ],
         default="type",
     )
+    featured_items_ordering = items_ordering.clone()
     currency = models.CharField(max_length=3, default="EUR")
     footer = tinymce.HTMLField(blank=True)
     footer_extended = tinymce.HTMLField(blank=True)

ram/portal/templates/_includes/documents.html

@@ -0,0 +1,26 @@
+                  {% if documents %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="3" scope="row">{{ header|default:"Documents" }}</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for d in documents.all %}
+                      <tr>
+                        <td class="w-33">{{ d.description }}</td>
+                        <td class="text-nowrap">
+                          {% if d.private %}
+                            <i class="bi bi-file-earmark-lock2"></i>
+                          {% else %}
+                            <i class="bi bi-file-earmark-text"></i>
+                          {% endif %}
+                          <a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a>
+                        </td>
+                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
+

ram/portal/templates/_modules/documents.html

@@ -0,0 +1,26 @@
+                  {% if documents %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="3" scope="row">{{ header|default:"Documents" }}</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for d in documents.all %}
+                      <tr>
+                        <td class="w-33">{{ d.description }}</td>
+                        <td class="text-nowrap">
+                          {% if d.private %}
+                            <i class="bi bi-file-earmark-lock2"></i>
+                          {% else %}
+                            <i class="bi bi-file-earmark-text"></i>
+                          {% endif %}
+                          <a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a>
+                        </td>
+                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
+

ram/portal/templates/_modules/properties.html

@@ -0,0 +1,18 @@
+                  {% if properties %}
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Properties</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                    {% for p in properties %}
+                      <tr>
+                        <th class="w-33" scope="row">{{ p.property }}</th>
+                        <td>{{ p.value }}</td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                  {% endif %}
+

ram/portal/templates/_modules/purchase_data.html

@@ -0,0 +1,29 @@
+                  {% if request.user.is_staff %}
+                    {% if data.shop or data.purchase_date or data.price %}
+                    <table class="table table-striped">
+                      <thead>
+                        <tr>
+                          <th colspan="2" scope="row">Purchase</th>
+                        </tr>
+                      </thead>
+                      <tbody class="table-group-divider">
+                        <tr>
+                          <th class="w-33" scope="row">Shop</th>
+                          <td>
+                            {{ data.shop|default:"-" }}
+                            {% if data.shop.website %} <a href="{{ data.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                          </td>
+                        </tr>
+                        <tr>
+                          <th class="w-33" scope="row">Purchase date</th>
+                          <td>{{ data.purchase_date|default:"-" }}</td>
+                        </tr>
+                        <tr>
+                          <th scope="row">Price ({{ site_conf.currency }})</th>
+                          <td>{{ data.price|default:"-" }}</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    {% endif %}
+                  {% endif %}
+

ram/portal/templates/base.html

@@ -148,7 +148,7 @@
               <strong>{{ site_conf.site_name }}</strong>
             </a>
          </div>
-         {% include 'includes/login.html' %}
+         {% include '_includes/login.html' %}
         </div>
       </nav>
     </header>
@@ -186,7 +186,7 @@
                 {% show_bookshelf_menu %}
                 {% show_flatpages_menu user %}
               </ul>
-              {% include 'includes/search.html' %}
+              {% include '_includes/search.html' %}
             </div>
           </div>
         </nav>
@@ -211,9 +211,9 @@
         <div class="container">{% block pagination %}{% endblock %}</div>
       </div>
       {% block extra_content %}{% endblock %}
-      {% include 'includes/symbols.html' %}
+      {% include '_includes/symbols.html' %}
     </main>
-    {% include 'includes/footer.html' %}
+    {% include '_includes/footer.html' %}
     {% if site_conf.use_cdn %}
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js"></script>
     {% else %}

ram/portal/templates/bookshelf/book.html

@@ -147,51 +147,10 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% if request.user.is_staff %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Purchase</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                      <tr>
-                        <th class="w-33" scope="row">Shop</th>
-                        <td>
-                          {{ data.shop|default:"-" }}
-                          {% if data.shop.website %} <a href="{{ data.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
-                      </tr>
-                      <tr>
-                        <th class="w-33" scope="row">Purchase date</th>
-                        <td>{{ data.purchase_date|default:"-" }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Price ({{ site_conf.currency }})</th>
-                        <td>{{ data.price|default:"-" }}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  {% endif %}
-                  {% if properties %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Properties</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for p in properties %}
-                      <tr>
-                        <th class="w-33" scope="row">{{ p.property }}</th>
-                        <td>{{ p.value }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
+                  {% include "_modules/purchase_data.html" %}
+                  {% include "_modules/properties.html" %}
                 </div>
-                <div class="tab-pane" id="nav-toc" role="tabpanel" aria-labelledby="nav-toc-tab">
+                <div class="tab-pane table-responsive" id="nav-toc" role="tabpanel" aria-labelledby="nav-toc-tab">
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -216,22 +175,7 @@
                   </table>
                 </div>
                 <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="3" scope="row">Documents</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for d in documents.all %}
-                      <tr>
-                        <td class="w-33">{{ d.description }}</td>
-                        <td><a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a></td>
-                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
+                  {% include "_modules/documents.html" %}
                 </div>
               </div>
               <div class="d-grid gap-2 d-md-flex justify-content-md-end">

ram/portal/templates/cards/consist.html

@@ -1,12 +1,13 @@
+{% load static %}
+
       <div class="col">
         <div class="card shadow-sm">
           <a href="{{ d.get_absolute_url }}">
-          {% if d.image %}
-            <img class="card-img-top" src="{{ d.image.url }}" alt="{{ d }}">
+          {% if d.get_cover %}
+            <img class="card-img-top" src="{{ d.get_cover.url }}" alt="{{ d }}">
           {% else %}
-            {% with d.consist_item.first.rolling_stock as r %}
-            <img class="card-img-top" src="{{ r.image.first.image.url }}" alt="{{ d }}">
-            {% endwith %}
+            <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
+            <a href="{{d.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}"></a>
           {% endif %}
           </a>
           <div class="card-body">

ram/portal/templates/consist.html

@@ -7,11 +7,11 @@
         {{ t.name }}</a>{# new line is required #}
         {% endfor %}
       </p>
+      {% endif %}
       {% if not consist.published %}
       <span class="badge text-bg-warning">Unpublished</span> |
       {% endif %}
       <small class="text-body-secondary">Updated {{ consist.updated_time | date:"M d, Y H:i" }}</small>
-      {% endif %}
       {% endblock %}
       {% block carousel %}
       {% if consist.image %}
@@ -26,6 +26,35 @@
       </div>
       {% endif %}
       {% endblock %}
+      {% block cards_layout %}
+      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
+      {% block cards %}
+        {% for d in data %}
+        {% include "cards/roster.html" %}
+        {% endfor %}
+      {% endblock %}
+      </div>
+      {% if loads %}
+      <div class="accordion shadow-sm mt-4" id="accordionLoads">
+        <div class="accordion-item">
+          <h2 class="accordion-header">
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseLoads" aria-expanded="false" aria-controls="collapseLoads">
+              <i class="bi bi-download"></i>&nbsp;Rolling Stock loaded on freight cars
+            </button>
+          </h2>
+          <div id="collapseLoads" class="accordion-collapse collapse" data-bs-parent="#accordionLoads">
+            <div class="accordion-body">
+              <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
+                {% for l in loads %}
+                {% include "cards/roster.html" with d=l %}
+                {% endfor %}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      {% endif %}
+      {% endblock %}
       {% block pagination %}
       {% if data.has_other_pages %}
       <nav aria-label="Page navigation">
@@ -76,7 +105,7 @@
               <option value="nav-summary" selected>Summary</option>
             </select>
             <div class="tab-content" id="nav-tabContent">
-              <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
+              <div class="tab-pane show active table-responsive" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                 <table class="table table-striped">
                   <thead>
                     <tr>
@@ -113,7 +142,7 @@
                     </tr>
                     <tr>
                       <th scope="row">Composition</th>
-                      <td>{% for t in consist.get_type_count %}{{ t.count }}x {{ t.type }} {{t.category }}{% if not forloop.last %} &raquo; {% endif %}{% endfor %}</td>
+                      <td>{% for t in consist.get_type_count %}{{ t.count }}x {{ t.type }} {{t.category }}{% if not forloop.last %} &raquo; {% endif %}{% endfor %}{% if loads %} | <i class="bi bi-download"></i> {{ loads|length }}x Load{{ loads|pluralize }}{% endif %}</td>
                     </tr>
                   </tbody>
                 </table>

ram/portal/templates/rollingstock.html

@@ -217,49 +217,8 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% if request.user.is_staff %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Purchase</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                      <tr>
-                        <th class="w-33" scope="row">Shop</th>
-                        <td>
-                          {{ rolling_stock.shop | default:"-" }}
-                          {% if rolling_stock.shop.website %} <a href="{{ rolling_stock.shop.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
-                      </tr>
-                      <tr>
-                        <th class="w-33" scope="row">Purchase date</th>
-                        <td>{{ rolling_stock.purchase_date | default:"-" }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Price ({{ site_conf.currency }})</th>
-                        <td>{{ rolling_stock.price | default:"-" }}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  {% endif %}
-                  {% if properties %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Properties</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for p in properties %}
-                      <tr>
-                        <th class="w-33" scope="row">{{ p.property }}</th>
-                        <td>{{ p.value }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
+                  {% include "_modules/purchase_data.html" with data=rolling_stock %}
+                  {% include "_modules/properties.html" %}
                 </div>
                 <div class="tab-pane" id="nav-class" role="tabpanel" aria-labelledby="nav-class-tab">
                   <table class="table table-striped">
@@ -296,23 +255,7 @@
                       {% endif %}
                     </tbody>
                   </table>
-                  {% if class_properties %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="2" scope="row">Properties</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for p in class_properties %}
-                      <tr>
-                        <th class="w-33" scope="row">{{ p.property }}</th>
-                        <td>{{ p.value }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
+                  {% include "_modules/properties.html" with properties=class_properties %}
                 </div>
                 <div class="tab-pane" id="nav-company" role="tabpanel" aria-labelledby="nav-company-tab">
                   <table class="table table-striped">
@@ -402,43 +345,9 @@
                     </tbody>
                   </table>
                 </div>
-                <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
-                  {% if documents %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="3" scope="row">Documents</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for d in documents.all %}
-                      <tr>
-                        <td class="w-33">{{ d.description }}</td>
-                        <td><a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a></td>
-                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
-                  {% if decoder_documents %}
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <th colspan="3" scope="row">Decoder documents</th>
-                      </tr>
-                    </thead>
-                    <tbody class="table-group-divider">
-                    {% for d in decoder_documents.all %}
-                      <tr>
-                        <td class="w-33">{{ d.description }}</td>
-                        <td><a href="{{ d.file.url }}" target="_blank">{{ d.filename }}</a></td>
-                        <td class="text-end">{{ d.file.size | filesizeformat }}</td>
-                      </tr>
-                    {% endfor %}
-                    </tbody>
-                  </table>
-                  {% endif %}
+                <div class="tab-pane table-responsive" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
+                  {% include "_modules/documents.html" %}
+                  {% include "_modules/documents.html" with documents=decoder_documents header="Decoder documents" %}
                 </div>
                 <div class="tab-pane" id="nav-journal" role="tabpanel" aria-labelledby="nav-journal-tab">
                   <table class="table table-striped">

ram/portal/views.py

@@ -6,6 +6,7 @@ from urllib.parse import unquote
 
 from django.conf import settings
 from django.views import View
+from django.urls import Resolver404
 from django.http import Http404, HttpResponseBadRequest
 from django.db.utils import OperationalError, ProgrammingError
 from django.db.models import F, Q, Count
@@ -36,30 +37,45 @@ def get_items_per_page():
     return int(items_per_page)
 
 
-def get_order_by_field():
+def get_items_ordering(config="items_ordering"):
     try:
-        order_by = get_site_conf().items_ordering
+        order_by = getattr(get_site_conf(), config)
     except (OperationalError, ProgrammingError):
         order_by = "type"
 
     fields = [
-        "rolling_class__type",
-        "rolling_class__company",
-        "rolling_class__identifier",
-        "road_number_int",
+        "rolling_class__type",              # 0
+        "rolling_class__company",           # 1
+        "rolling_class__company__country",  # 2
+        "rolling_class__identifier",        # 3
+        "road_number_int",                  # 4
     ]
 
-    if order_by == "type":
-        return (fields[0], fields[1], fields[2], fields[3])
-    elif order_by == "company":
-        return (fields[1], fields[0], fields[2], fields[3])
-    elif order_by == "identifier":
-        return (fields[2], fields[0], fields[1], fields[3])
+    order_map = {
+        "type": (0, 1, 3, 4),
+        "company": (1, 0, 3, 4),
+        "country": (2, 0, 1, 3, 4),
+        "cou+com": (2, 1, 0, 3, 4),
+        "class": (0, 3, 1, 4),
+    }
+
+    return tuple(fields[i] for i in order_map.get(order_by, "type"))
 
 
 class Render404(View):
     def get(self, request, exception):
-        return render(request, "base.html", {"title": "404 page not found"})
+        generic_message = "Page not found"
+        if isinstance(exception, Resolver404):
+            message = generic_message
+        else:
+            message = str(exception) if exception else generic_message
+
+        return render(
+            request,
+            "base.html",
+            {"title": message},
+            status=404,
+        )
 
 
 class GetData(View):
@@ -70,7 +86,7 @@ class GetData(View):
     def get_data(self, request):
         return (
             RollingStock.objects.get_published(request.user)
-            .order_by(*get_order_by_field())
+            .order_by(*get_items_ordering())
             .filter(self.filter)
         )
 
@@ -107,7 +123,9 @@ class GetHome(GetData):
         return (
             RollingStock.objects.get_published(request.user)
             .filter(featured=True)
-            .order_by(*get_order_by_field())[:max_items]
+            .order_by(*get_items_ordering(config="featured_items_ordering"))[
+                :max_items
+            ]
         ) or super().get_data(request)
 
 
@@ -174,7 +192,7 @@ class SearchObjects(View):
             RollingStock.objects.get_published(request.user)
             .filter(query)
             .distinct()
-            .order_by(*get_order_by_field())
+            .order_by(*get_items_ordering())
         )
         data = list(roster)
 
@@ -196,6 +214,7 @@ class SearchObjects(View):
                     Q(
                         Q(title__icontains=search)
                         | Q(description__icontains=search)
+                        | Q(toc__title__icontains=search)
                     )
                 )
                 .distinct()
@@ -217,6 +236,7 @@ class SearchObjects(View):
                     Q(
                         Q(magazine__name__icontains=search)
                         | Q(description__icontains=search)
+                        | Q(toc__title__icontains=search)
                     )
                 )
                 .distinct()
@@ -299,7 +319,7 @@ class GetManufacturerItem(View):
         if search != "all":
             roster = get_list_or_404(
                 RollingStock.objects.get_published(request.user).order_by(
-                    *get_order_by_field()
+                    *get_items_ordering()
                 ),
                 Q(
                     Q(manufacturer=manufacturer)
@@ -321,7 +341,7 @@ class GetManufacturerItem(View):
                     | Q(rolling_class__manufacturer=manufacturer)
                 )
                 .distinct()
-                .order_by(*get_order_by_field())
+                .order_by(*get_items_ordering())
             )
             catalogs = Catalog.objects.get_published(request.user).filter(
                 manufacturer=manufacturer
@@ -374,7 +394,7 @@ class GetObjectsFiltered(View):
             RollingStock.objects.get_published(request.user)
             .filter(query)
             .distinct()
-            .order_by(*get_order_by_field())
+            .order_by(*get_items_ordering())
         )
 
         data = list(roster)
@@ -478,7 +498,7 @@ class GetRollingStock(View):
                     & Q(set=True)
                 )
             )
-            .order_by(*get_order_by_field())
+            .order_by(*get_items_ordering())
         )
 
         return render(
@@ -518,7 +538,13 @@ class GetConsist(View):
             RollingStock.objects.get_published(request.user).get(
                 uuid=r.rolling_stock_id
             )
-            for r in consist.consist_item.all()
+            for r in consist.consist_item.filter(load=False)
+        )
+        loads = list(
+            RollingStock.objects.get_published(request.user).get(
+                uuid=r.rolling_stock_id
+            )
+            for r in consist.consist_item.filter(load=True)
         )
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -533,6 +559,7 @@ class GetConsist(View):
                 "title": consist,
                 "consist": consist,
                 "data": data,
+                "loads": loads,
                 "page_range": page_range,
             },
         )

ram/ram/__init__.py

@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.19.2"
+__version__ = "0.19.8"
 __version__ += git_suffix(__file__)

ram/ram/admin.py

@@ -1,22 +1,60 @@
-from django.contrib import admin
 from django.conf import settings
+from django.contrib import admin
+from django.core.cache import cache
 
 admin.site.site_header = settings.SITE_NAME
 
 
 def publish(modeladmin, request, queryset):
-    for obj in queryset:
-        obj.published = True
-        obj.save()
+    queryset.update(published=True)
+    cache.clear()
 
 
 publish.short_description = "Publish selected items"
 
 
 def unpublish(modeladmin, request, queryset):
-    for obj in queryset:
-        obj.published = False
-        obj.save()
+    queryset.update(published=False)
+    cache.clear()
 
 
 unpublish.short_description = "Unpublish selected items"
+
+
+def set_featured(modeladmin, request, queryset):
+    count = queryset.count()
+    if count > settings.FEATURED_ITEMS_MAX:
+        modeladmin.message_user(
+            request,
+            "You can only mark up to {} items as featured.".format(
+                settings.FEATURED_ITEMS_MAX
+            ),
+            level="error",
+        )
+        return
+    featured = modeladmin.model.objects.filter(featured=True).count()
+    if featured + count > settings.FEATURED_ITEMS_MAX:
+        modeladmin.message_user(
+            request,
+            "There are already {} featured items. You can only mark {} more items as featured.".format(  # noqa: E501
+                featured,
+                settings.FEATURED_ITEMS_MAX - featured,
+            ),
+            level="error",
+        )
+        return
+    queryset.update(featured=True)
+    cache.clear()
+
+
+set_featured.short_description = "Mark selected items as featured"
+
+
+def unset_featured(modeladmin, request, queryset):
+    queryset.update(featured=False)
+    cache.clear()
+
+
+unset_featured.short_description = (
+    "Unmark selected items as featured"
+)

ram/ram/local_settings.py.tmpl

@@ -34,3 +34,4 @@ ALLOWED_HOSTS = ["127.0.0.1", "myhost"]
 CSRF_TRUSTED_ORIGINS = ["https://myhost"]
 STATIC_URL = "static/"
 MEDIA_URL = "media/"
+USE_X_ACCEL_REDIRECT = True

ram/ram/settings.py

@@ -206,6 +206,19 @@ ROLLING_STOCK_TYPES = [
 
 FEATURED_ITEMS_MAX = 6
 
+# If True, use X-Accel-Redirect (Nginx)
+# when using X-Accel-Redirect, we don't serve the file
+# directly from Django, but let Nginx handle it
+# in Nginx config, we need to map /private/ to
+# the actual media files location with internal directive
+# eg:
+#   location /private {
+#       internal;
+#       alias /path/to/media;
+#   }
+# make also sure that the entire /media is _not_ mapped directly in Nginx
+USE_X_ACCEL_REDIRECT = False
+
 try:
     from ram.local_settings import *
 except ImportError:

ram/ram/urls.py

@@ -21,17 +21,22 @@ from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import include, path
 
-from ram.views import UploadImage
+from ram.views import UploadImage, DownloadFile
 from portal.views import Render404
 
 handler404 = Render404.as_view()
 
 urlpatterns = [
     path("", lambda r: redirect("portal/")),
+    path("admin/", admin.site.urls),
     path("tinymce/", include("tinymce.urls")),
     path("tinymce/upload_image", UploadImage.as_view(), name="upload_image"),
+    path(
+        "media/files/<path:filename>",
+        DownloadFile.as_view(),
+        name="download_file",
+    ),
     path("portal/", include("portal.urls")),
-    path("admin/", admin.site.urls),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # Enable the "/dcc" routing only if the "driver" app is active
@@ -55,6 +60,7 @@ if settings.DEBUG:
     if settings.REST_ENABLED:
         from django.views.generic import TemplateView
         from rest_framework.schemas import get_schema_view
+
         urlpatterns += [
             path(
                 "swagger/",

ram/ram/views.py

@@ -5,19 +5,26 @@ import posixpath
 from pathlib import Path
 from PIL import Image, UnidentifiedImageError
 
-from django.views import View
+from django.apps import apps
 from django.conf import settings
 from django.http import (
+    Http404,
+    HttpResponse,
     HttpResponseBadRequest,
     HttpResponseForbidden,
+    FileResponse,
     JsonResponse,
 )
+from django.views import View
 from django.utils.text import slugify as slugify
+from django.utils.encoding import smart_str
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 
 from rest_framework.pagination import LimitOffsetPagination
 
+from ram.models import PrivateDocument
+
 
 class CustomLimitOffsetPagination(LimitOffsetPagination):
     default_limit = 10
@@ -67,3 +74,50 @@ class UploadImage(View):
                     ),
                 }
             )
+
+
+class DownloadFile(View):
+    def get(self, request, filename, disposition="inline"):
+        # Clean up the filename to prevent directory traversal attacks
+        filename = os.path.basename(filename)
+
+        # Find a document where the stored file name matches
+        # Find all models inheriting from PublishableFile
+        for model in apps.get_models():
+            if issubclass(model, PrivateDocument) and not model._meta.abstract:
+                try:
+                    doc = model.objects.get(file__endswith=filename)
+                    if doc.private and not request.user.is_staff:
+                        break
+
+                    file = doc.file
+                    if not os.path.exists(file.path):
+                        break
+
+                    # in Nginx config, we need to map /private/ to
+                    # the actual media files location with internal directive
+                    # eg:
+                    #   location /private {
+                    #       internal;
+                    #       alias /path/to/media;
+                    #   }
+                    if getattr(settings, "USE_X_ACCEL_REDIRECT", False):
+                        response = HttpResponse()
+                        response["Content-Type"] = ""
+                        response["X-Accel-Redirect"] = f"/private/{file.name}"
+                    else:
+                        response = FileResponse(
+                            open(file.path, "rb"), as_attachment=True
+                        )
+
+                    response["Content-Disposition"] = (
+                        '{}; filename="{}"'.format(
+                            disposition,
+                            smart_str(os.path.basename(file.path))
+                        )
+                    )
+                    return response
+                except model.DoesNotExist:
+                    continue
+
+        raise Http404("File not found")

ram/roster/admin.py

@@ -6,8 +6,8 @@ from django.utils.html import format_html, format_html_join, strip_tags
 
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
-from ram.admin import publish, unpublish
 from ram.utils import generate_csv
+from ram.admin import publish, unpublish, set_featured, unset_featured
 from repository.models import RollingStockDocument
 from portal.utils import get_site_conf
 from roster.models import (
@@ -303,37 +303,4 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
 
     download_csv.short_description = "Download selected items as CSV"
 
-    def set_featured(modeladmin, request, queryset):
-        count = queryset.count()
-        if count > settings.FEATURED_ITEMS_MAX:
-            modeladmin.message_user(
-                request,
-                "You can only mark up to {} items as featured.".format(
-                    settings.FEATURED_ITEMS_MAX
-                ),
-                level="error",
-            )
-            return
-        featured = RollingStock.objects.filter(featured=True).count()
-        if featured + count > settings.FEATURED_ITEMS_MAX:
-            modeladmin.message_user(
-                request,
-                "There are already {} featured items. You can only mark {} more items as featured.".format(  # noqa: E501
-                    featured,
-                    settings.FEATURED_ITEMS_MAX - featured,
-                ),
-                level="error",
-            )
-            return
-        queryset.update(featured=True)
-
-    set_featured.short_description = "Mark selected rolling stock as featured"
-
-    def unset_featured(modeladmin, request, queryset):
-        queryset.update(featured=False)
-
-    unset_featured.short_description = (
-        "Unmark selected rolling stock as featured"
-    )
-
     actions = [publish, unpublish, set_featured, unset_featured, download_csv]