From 0bfefa79ac8bc6a9d88da34d5e64369edd54beee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sun, 7 Aug 2022 16:54:38 +0200
Subject: [PATCH 1/6] Add support for private documents

---
 ram/portal/templates/page.html                 |  4 ++--
 ram/portal/views.py                            |  6 ++++++
 .../0010_rollingstockdocument_private.py       | 18 ++++++++++++++++++
 ram/roster/models.py                           |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 ram/roster/migrations/0010_rollingstockdocument_private.py

diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html
index ae3c744..a355c0d 100644
--- a/ram/portal/templates/page.html
+++ b/ram/portal/templates/page.html
@@ -47,7 +47,7 @@ <h5 class="modal-title" id="pictureModalLabel{{ forloop.counter }}">{{ rolling_s
                   <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>
                   {% 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 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 rolling_stock.document.count > 0 %}<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 rolling_stock_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 %}
                  </div>
               </nav>
               <div class="tab-content" id="nav-tabContent">
@@ -268,7 +268,7 @@ <h5 class="modal-title" id="pictureModalLabel{{ forloop.counter }}">{{ rolling_s
                       </tr>
                     </thead>
                     <tbody>
-                    {% for d in rolling_stock.document.all %}
+                    {% for d in rolling_stock_documents %}
                       <tr>
                         <td>{{ d.description }}</td>
                         <td><a href="{{ d.file.url }}">{{ d.filename }}</a></td>
diff --git a/ram/portal/views.py b/ram/portal/views.py
index 7c890ac..797e98a 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -151,6 +151,11 @@ def get(self, request, uuid):
             if request.user.is_authenticated
             else rolling_stock.property.filter(property__private=False)
         )
+        rolling_stock_documents = (
+            rolling_stock.document.all()
+            if request.user.is_authenticated
+            else rolling_stock.document.filter(private=False)
+        )
 
         return render(
             request,
@@ -159,6 +164,7 @@ def get(self, request, uuid):
                 "rolling_stock": rolling_stock,
                 "class_properties": class_properties,
                 "rolling_stock_properties": rolling_stock_properties,
+                "rolling_stock_documents": rolling_stock_documents,
             },
         )
 
diff --git a/ram/roster/migrations/0010_rollingstockdocument_private.py b/ram/roster/migrations/0010_rollingstockdocument_private.py
new file mode 100644
index 0000000..d99749c
--- /dev/null
+++ b/ram/roster/migrations/0010_rollingstockdocument_private.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-08-02 20:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('roster', '0009_alter_rollingstock_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rollingstockdocument',
+            name='private',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/ram/roster/models.py b/ram/roster/models.py
index 52b4e8a..77c72ad 100644
--- a/ram/roster/models.py
+++ b/ram/roster/models.py
@@ -133,6 +133,7 @@ class RollingStockDocument(models.Model):
     )
     description = models.CharField(max_length=128, blank=True)
     file = models.FileField(upload_to="files/", null=True, blank=True)
+    private = models.BooleanField(default=False)
 
     class Meta(object):
         unique_together = ("rolling_stock", "file")

From 11459916b80fb5fdbcbb98671653bf426f767898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sat, 29 Oct 2022 22:37:40 +0200
Subject: [PATCH 2/6] Private documents

---
 ram/metadata/admin.py                             |  1 +
 ram/portal/templates/page.html                    |  2 +-
 ram/roster/admin.py                               |  1 +
 ram/roster/migrations/0013_merge_20221023_1014.py | 13 +++++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 ram/roster/migrations/0013_merge_20221023_1014.py

diff --git a/ram/metadata/admin.py b/ram/metadata/admin.py
index 8e5602e..0b38c64 100644
--- a/ram/metadata/admin.py
+++ b/ram/metadata/admin.py
@@ -14,6 +14,7 @@
 
 @admin.register(Property)
 class PropertyAdmin(admin.ModelAdmin):
+    list_display = ("name", "private")
     search_fields = ("name",)
 
 
diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html
index 4d0731b..5c38821 100644
--- a/ram/portal/templates/page.html
+++ b/ram/portal/templates/page.html
@@ -46,7 +46,7 @@ <h5 class="modal-title" id="pictureModalLabel{{ forloop.counter }}">{{ rolling_s
                   <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>
                   {% 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 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 rolling_stock.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 rolling_stock_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 rolling_stock_journal.count > 0 %}<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 %}
                  </div>
               </nav>
diff --git a/ram/roster/admin.py b/ram/roster/admin.py
index a12ce43..2727e67 100644
--- a/ram/roster/admin.py
+++ b/ram/roster/admin.py
@@ -62,6 +62,7 @@ class RollingStockDocumentAdmin(admin.ModelAdmin):
         "__str__",
         "rolling_stock",
         "description",
+        "private",
         "download",
     )
     search_fields = (
diff --git a/ram/roster/migrations/0013_merge_20221023_1014.py b/ram/roster/migrations/0013_merge_20221023_1014.py
new file mode 100644
index 0000000..5e4865b
--- /dev/null
+++ b/ram/roster/migrations/0013_merge_20221023_1014.py
@@ -0,0 +1,13 @@
+# Generated by Django 4.1.2 on 2022-10-23 10:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("roster", "0010_rollingstockdocument_private"),
+        ("roster", "0012_rollingstockjournal"),
+    ]
+
+    operations = []

From 8e239bffa16294429df6dc74e5f87584f6e14c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Mon, 18 Sep 2023 22:12:50 +0200
Subject: [PATCH 3/6] Fix migrations after mere

---
 ram/roster/migrations/0013_merge_20221023_1014.py   | 13 -------------
 ...vate.py => 0018_rollingstockdocument_private.py} |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 ram/roster/migrations/0013_merge_20221023_1014.py
 rename ram/roster/migrations/{0010_rollingstockdocument_private.py => 0018_rollingstockdocument_private.py} (84%)

diff --git a/ram/roster/migrations/0013_merge_20221023_1014.py b/ram/roster/migrations/0013_merge_20221023_1014.py
deleted file mode 100644
index 5e4865b..0000000
--- a/ram/roster/migrations/0013_merge_20221023_1014.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by Django 4.1.2 on 2022-10-23 10:14
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("roster", "0010_rollingstockdocument_private"),
-        ("roster", "0012_rollingstockjournal"),
-    ]
-
-    operations = []
diff --git a/ram/roster/migrations/0010_rollingstockdocument_private.py b/ram/roster/migrations/0018_rollingstockdocument_private.py
similarity index 84%
rename from ram/roster/migrations/0010_rollingstockdocument_private.py
rename to ram/roster/migrations/0018_rollingstockdocument_private.py
index d99749c..cf904e5 100644
--- a/ram/roster/migrations/0010_rollingstockdocument_private.py
+++ b/ram/roster/migrations/0018_rollingstockdocument_private.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('roster', '0009_alter_rollingstock_options_and_more'),
+        ('roster', '0017_remove_rollingstockimage_is_thumbnail'),
     ]
 
     operations = [

From f916ec3fff1eff0d2f4908caea7435a8c8906104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Fri, 6 Oct 2023 21:48:41 +0200
Subject: [PATCH 4/6] Rebase fixtures

---
 .../migrations/0013_decoderdocument_private.py | 18 ++++++++++++++++++
 ...py => 0019_rollingstockdocument_private.py} |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 ram/metadata/migrations/0013_decoderdocument_private.py
 rename ram/roster/migrations/{0018_rollingstockdocument_private.py => 0019_rollingstockdocument_private.py} (55%)

diff --git a/ram/metadata/migrations/0013_decoderdocument_private.py b/ram/metadata/migrations/0013_decoderdocument_private.py
new file mode 100644
index 0000000..af62945
--- /dev/null
+++ b/ram/metadata/migrations/0013_decoderdocument_private.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-06 19:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0012_alter_decoder_manufacturer_decoderdocument"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="decoderdocument",
+            name="private",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/ram/roster/migrations/0018_rollingstockdocument_private.py b/ram/roster/migrations/0019_rollingstockdocument_private.py
similarity index 55%
rename from ram/roster/migrations/0018_rollingstockdocument_private.py
rename to ram/roster/migrations/0019_rollingstockdocument_private.py
index cf904e5..cc06b31 100644
--- a/ram/roster/migrations/0018_rollingstockdocument_private.py
+++ b/ram/roster/migrations/0019_rollingstockdocument_private.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.6 on 2022-08-02 20:23
+# Generated by Django 4.2.5 on 2023-10-06 19:48
 
 from django.db import migrations, models
 
@@ -6,13 +6,13 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('roster', '0017_remove_rollingstockimage_is_thumbnail'),
+        ("roster", "0018_rename_sku_rollingstock_item_number"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='rollingstockdocument',
-            name='private',
+            model_name="rollingstockdocument",
+            name="private",
             field=models.BooleanField(default=False),
         ),
     ]

From 8fee225b73d4c1a04363f965c715e766f1a305b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sat, 7 Oct 2023 22:28:10 +0200
Subject: [PATCH 5/6] Filter private decoder docs

---
 ram/portal/templates/cards/rolling_stock.html |  2 +-
 ram/portal/templates/rollingstock.html        | 18 +++----
 ram/portal/views.py                           | 53 ++++++++++---------
 ram/ram/__init__.py                           |  2 +-
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/ram/portal/templates/cards/rolling_stock.html b/ram/portal/templates/cards/rolling_stock.html
index d69acaf..f82db4c 100644
--- a/ram/portal/templates/cards/rolling_stock.html
+++ b/ram/portal/templates/cards/rolling_stock.html
@@ -1,7 +1,7 @@
 {% load static %}
         <div class="col">
           <div class="card shadow-sm">
-            {% if d.item.image.count > 0 %}
+            {% 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>
             {% else %}
             <!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 18de4ea..3b98911 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -48,8 +48,8 @@
                 <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>
                 {% 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 rolling_stock.document.count > 0 or rolling_stock.decoder.document.count > 0 %}<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 rolling_stock_journal.count > 0 %}<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 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 %}
               </nav>
               <div class="tab-content" id="nav-tabContent">
@@ -170,7 +170,7 @@
                       </tr>
                     </tbody>
                   </table>
-                  {% if rolling_stock_properties %}
+                  {% if properties %}
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -178,7 +178,7 @@
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
-                    {% for p in rolling_stock_properties %}
+                    {% for p in properties %}
                       <tr>
                         <th class="w-33" scope="row">{{ p.property }}</th>
                         <td>{{ p.value }}</td>
@@ -276,7 +276,7 @@
                   </table>
                 </div>
                 <div class="tab-pane" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
-                  {% if rolling_stock.document.count > 0 %}
+                  {% if documents %}
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -284,7 +284,7 @@
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
-                    {% for d in rolling_stock.document.all %}
+                    {% 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>
@@ -294,7 +294,7 @@
                     </tbody>
                   </table>
                   {% endif %}
-                  {% if rolling_stock.decoder.document.count > 0 %}
+                  {% if decoder_documents %}
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -302,7 +302,7 @@
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
-                    {% for d in rolling_stock.decoder.document.all %}
+                    {% 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>
@@ -321,7 +321,7 @@
                       </tr>
                     </thead>
                     <tbody class="table-group-divider">
-                    {% for j in rolling_stock_journal %}
+                    {% for j in journal %}
                       <tr>
                         <th class="w-33" scope="row">{{ j.date }}</th>
                         <td>{{ j.log | safe }}</a></td>
diff --git a/ram/portal/views.py b/ram/portal/views.py
index 101f272..7ac28b2 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -16,7 +16,9 @@
 from roster.models import RollingStock
 from consist.models import Consist
 from bookshelf.models import Book
-from metadata.models import Company, Manufacturer, Scale, RollingStockType, Tag
+from metadata.models import (
+    Company, Manufacturer, Scale, DecoderDocument, RollingStockType, Tag
+)
 
 
 def order_by_fields():
@@ -305,29 +307,29 @@ def get(self, request, uuid):
         except ObjectDoesNotExist:
             raise Http404
 
-        class_properties = (
-            rolling_stock.rolling_class.property.all()
-            if request.user.is_authenticated
-            else rolling_stock.rolling_class.property.filter(
+        # FIXME there's likely a better and more efficient way of doing this
+        # but keeping KISS for now
+        decoder_documents = []
+        if request.user.is_authenticated:
+            class_properties = rolling_stock.rolling_class.property.all()
+            properties = rolling_stock.property.all()
+            documents = rolling_stock.document.all()
+            journal = rolling_stock.journal.all()
+            if rolling_stock.decoder:
+                decoder_documents = rolling_stock.decoder.document.all()
+        else:
+            class_properties = rolling_stock.rolling_class.property.filter(
                 property__private=False
             )
-        )
-        rolling_stock_properties = (
-            rolling_stock.property.all()
-            if request.user.is_authenticated
-            else rolling_stock.property.filter(property__private=False)
-        )
-        rolling_stock_documents = (
-            rolling_stock.document.all()
-            if request.user.is_authenticated
-            else rolling_stock.document.filter(private=False)
-        )
-
-        rolling_stock_journal = (
-            rolling_stock.journal.all()
-            if request.user.is_authenticated
-            else rolling_stock.journal.filter(private=False)
-        )
+            properties = rolling_stock.property.filter(
+                property__private=False
+            )
+            documents = rolling_stock.document.filter(private=False)
+            journal = rolling_stock.journal.filter(private=False)
+            if rolling_stock.decoder:
+                decoder_documents = rolling_stock.decoder.document.filter(
+                    private=False
+                )
 
         return render(
             request,
@@ -336,9 +338,10 @@ def get(self, request, uuid):
                 "title": rolling_stock,
                 "rolling_stock": rolling_stock,
                 "class_properties": class_properties,
-                "rolling_stock_properties": rolling_stock_properties,
-                "rolling_stock_documents": rolling_stock_documents,
-                "rolling_stock_journal": rolling_stock_journal,
+                "properties": properties,
+                "decoder_documents": decoder_documents,
+                "documents": documents,
+                "journal": journal,
             },
         )
 
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index e8b139f..37c1b33 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"
 __version__ += git_suffix(__file__)

From cdb5f42ca57cdb4b3b735df8c8d0804428b1e1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sat, 7 Oct 2023 22:37:35 +0200
Subject: [PATCH 6/6] Enable preview of unpublished pages

---
 ram/portal/models.py | 9 ++++-----
 ram/portal/views.py  | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ram/portal/models.py b/ram/portal/models.py
index be84623..7305f8e 100644
--- a/ram/portal/models.py
+++ b/ram/portal/models.py
@@ -66,12 +66,11 @@ def get_absolute_url(self):
         return reverse("flatpage", kwargs={"flatpage": self.path})
 
     def get_link(self):
-        if self.published:
-            return mark_safe(
-                '<a href="{0}" target="_blank">Link</a>'.format(
-                    self.get_absolute_url()
-                )
+        return mark_safe(
+            '<a href="{0}" target="_blank">Link</a>'.format(
+                self.get_absolute_url()
             )
+        )
 
 
 @receiver(models.signals.pre_save, sender=Flatpage)
diff --git a/ram/portal/views.py b/ram/portal/views.py
index 7ac28b2..bec4687 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -446,12 +446,13 @@ def get(self, request, uuid):
 class GetFlatpage(View):
     def get(self, request, flatpage):
         try:
-            flatpage = Flatpage.objects.get(
-                Q(Q(path=flatpage) & Q(published=True))
-            )
+            flatpage = Flatpage.objects.get(path=flatpage)
         except ObjectDoesNotExist:
             raise Http404
 
+        if not request.user.is_authenticated:
+            flatpage = flatpage.filter(published=False)
+
         return render(
             request,
             "flatpages/flatpage.html",