Various improvements for flatpages

ram/consist/migrations/0006_md_to_html.py

@@ -6,11 +6,11 @@ from django.db import migrations
 
 def md_to_html(apps, schema_editor):
     fields = {
-        'Consist': ['notes'],
+        "Consist": ["notes"],
     }
 
     for m in fields.items():
-        model = apps.get_model('consist', m[0])
+        model = apps.get_model("consist", m[0])
 
         for row in model.objects.all():
             for field in m[1]:

ram/portal/admin.py

@@ -9,7 +9,8 @@ admin.site.register(SiteConfiguration, SingletonModelAdmin)
 @admin.register(Flatpage)
 class FlatpageAdmin(admin.ModelAdmin):
     readonly_fields = ("path", "creation_time", "updated_time")
-    list_display = ("name", "path")
+    list_display = ("name", "path", "published", "get_link")
+    list_filter = ("published",)
     search_fields = ("name",)
 
     fieldsets = (
@@ -20,7 +21,7 @@ class FlatpageAdmin(admin.ModelAdmin):
                     "name",
                     "path",
                     "content",
-                    "draft",
+                    "published",
                 )
             },
         ),

ram/portal/migrations/0012_md_to_html.py

@@ -6,12 +6,12 @@ from django.db import migrations
 
 def md_to_html(apps, schema_editor):
     fields = {
-        'SiteConfiguration': ['about', 'footer', 'footer_extended'],
+        "SiteConfiguration": ["about", "footer", "footer_extended"],
-        'Flatpage': ['content']
+        "Flatpage": ["content"]
     }
 
     for m in fields.items():
-        model = apps.get_model('portal', m[0])
+        model = apps.get_model("portal", m[0])
 
         for row in model.objects.all():
             for field in m[1]:

ram/portal/migrations/0013_remove_flatpage_draft_flatpage_published.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.1 on 2022-08-25 10:18
+
+from django.db import migrations, models
+
+
+def reverse_bool(apps, schema_editor):
+    model = apps.get_model("portal", "Flatpage")
+
+    for row in model.objects.all():
+        row.published = not row.draft
+        row.save(update_fields=["published"])
+
+
+def reverse_bool_back(apps, schema_editor):
+    model = apps.get_model("portal", "Flatpage")
+
+    for row in model.objects.all():
+        row.draft = not row.published
+        row.save(update_fields=["draft"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("portal", "0012_md_to_html"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="flatpage",
+            name="published",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(
+            reverse_bool,
+            reverse_code=reverse_bool_back
+        ),
+        migrations.RemoveField(
+            model_name="flatpage",
+            name="draft",
+        ),
+    ]

ram/portal/models.py

@@ -2,6 +2,7 @@ import django
 from django.db import models
 from django.urls import reverse
 from django.dispatch.dispatcher import receiver
+from django.utils.safestring import mark_safe
 from solo.models import SingletonModel
 
 from ckeditor.fields import RichTextField
@@ -51,7 +52,7 @@ class SiteConfiguration(SingletonModel):
 class Flatpage(models.Model):
     name = models.CharField(max_length=256, unique=True)
     path = models.CharField(max_length=256, unique=True)
-    draft = models.BooleanField(default=True)
+    published = models.BooleanField(default=False)
     content = RichTextUploadingField()
     creation_time = models.DateTimeField(auto_now_add=True)
     updated_time = models.DateTimeField(auto_now=True)
@@ -62,6 +63,14 @@ class Flatpage(models.Model):
     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()
+                )
+            )
+
 
 @receiver(models.signals.pre_save, sender=Flatpage)
 def tag_pre_save(sender, instance, **kwargs):

ram/portal/templates/base.html

@@ -73,7 +73,7 @@
                 </li>
                 {% show_menu %}
               </ul>
-                    {% include 'includes/search.html' %}
+              {% include 'includes/search.html' %}
             </div>
           </div>
         </nav>

ram/portal/templates/flatpage_menu.html

@@ -3,10 +3,10 @@
                   <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                     More ...
                   </a>
-                  {% for m in menu %}
                   <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                  {% for m in menu %}
                     <li><a class="dropdown-item" href="{{ m.get_absolute_url }}">{{ m.name }}</a></li>
-                  </ul>
                   {% endfor %}
+                  </ul>
                 </li>
                 {% endif %}

ram/portal/templates/includes/login.html

@@ -7,6 +7,7 @@
           <li><a class="dropdown-item" href="{% url 'admin:roster_rollingstock_changelist' %}">Rolling stock</a></li>
           <li><a class="dropdown-item" href="{% url 'admin:consist_consist_changelist' %}">Consists</a></li>
           <li><a class="dropdown-item" href="{% url 'admin:app_list' 'metadata' %}">Metadata</a></li>
+          <li><a class="dropdown-item" href="{% url 'admin:portal_flatpage_changelist' %}">Pages</a></li>
           <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>

ram/portal/templatetags/show_menu.py

@@ -6,5 +6,5 @@ register = template.Library()
 
 @register.inclusion_tag('flatpage_menu.html')
 def show_menu():
-    menu = Flatpage.objects.all()
+    menu = Flatpage.objects.filter(published=True).order_by("name")
     return {"menu": menu}

ram/portal/views.py

@@ -249,7 +249,7 @@ class GetFlatpage(View):
     def get(self, request, flatpage):
         try:
             flatpage = Flatpage.objects.get(
-                Q(Q(path=flatpage) & Q(draft=False))
+                Q(Q(path=flatpage) & Q(published=True))
             )
         except ObjectDoesNotExist:
             raise Http404

ram/ram/__init__.py

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

ram/roster/migrations/0011_md_to_html.py

@@ -6,11 +6,11 @@ from django.db import migrations
 
 def md_to_html(apps, schema_editor):
     fields = {
-        'RollingStock': ['notes'],
+        "RollingStock": ["notes"],
     }
 
     for m in fields.items():
-        model = apps.get_model('roster', m[0])
+        model = apps.get_model("roster", m[0])
 
         for row in model.objects.all():
             for field in m[1]: