As an editor fixing mistakes, it would be useful to be able to temporarily unpublish a document rather than deleting it

africanlii/views/home.py

@@ -22,15 +22,21 @@ def get_context_data(self, **kwargs):
         )
 
         context["recent_articles"] = recent_articles
-        context["recent_soft_law"] = GenericDocument.objects.exclude(
-            frbr_uri_doctype="doc"
-        ).order_by("-date")[:5]
-        context["recent_reports_guides"] = GenericDocument.objects.filter(
-            frbr_uri_doctype="doc"
-        ).order_by("-date")[:5]
-        context["recent_legal_instruments"] = CoreDocument.objects.filter(
-            frbr_uri_doctype="act"
-        ).order_by("-date")[:5]
+        context["recent_soft_law"] = (
+            GenericDocument.objects.exclude(published=False)
+            .exclude(frbr_uri_doctype="doc")
+            .order_by("-date")[:5]
+        )
+        context["recent_reports_guides"] = (
+            GenericDocument.objects.exclude(published=False)
+            .filter(frbr_uri_doctype="doc")
+            .order_by("-date")[:5]
+        )
+        context["recent_legal_instruments"] = (
+            CoreDocument.objects.exclude(published=False)
+            .filter(frbr_uri_doctype="act")
+            .order_by("-date")[:5]
+        )
         context["au_organs"] = AfricanUnionOrgan.objects.prefetch_related("author")
         context["au_institutions"] = AfricanUnionInstitution.objects.prefetch_related(
             "author"

liiweb/views/general.py

@@ -10,8 +10,12 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         context["court_classes"] = CourtClass.objects.prefetch_related("courts")
-        context["recent_judgments"] = Judgment.objects.order_by("-date")[:5]
-        context["recent_legislation"] = Legislation.objects.order_by("-date")[:10]
+        context["recent_judgments"] = Judgment.objects.exclude(
+            published=False
+        ).order_by("-date")[:5]
+        context["recent_legislation"] = Legislation.objects.exclude(
+            published=False
+        ).order_by("-date")[:10]
         context["taxonomies"] = Taxonomy.dump_bulk()
         context["taxonomy_url"] = "taxonomy_detail"
         context["recent_articles"] = (

liiweb/views/legislation.py

@@ -17,7 +17,8 @@ class LegislationListView(TemplateView):
 
     def get_queryset(self):
         qs = (
-            self.model.objects.distinct("work_frbr_uri")
+            self.model.objects.exclude(published=False)
+            .distinct("work_frbr_uri")
             .order_by("work_frbr_uri", "-date", "language__pk")
             .preferred_language(get_language(self.request))
         )

peachjam/admin.py

@@ -371,6 +371,8 @@ class DocumentAdmin(BaseAdmin):
         "reindex_for_search",
         "apply_labels",
         "ensure_source_file_pdf",
+        "publish",
+        "unpublish",
     ]
 
     fieldsets = [
@@ -429,6 +431,7 @@ class DocumentAdmin(BaseAdmin):
                     "toc_json",
                     "content_html_is_akn",
                     "allow_robots",
+                    "published",
                 ],
             },
         ),
@@ -587,6 +590,18 @@ def has_change_permission(self, request, obj=None):
             return True
         return super().has_change_permission(request, obj=obj)
 
+    def publish(self, request, queryset):
+        queryset.update(published=True)
+        self.message_user(request, _("Documents published."))
+
+    publish.short_description = gettext_lazy("Publish selected documents")
+
+    def unpublish(self, request, queryset):
+        queryset.update(published=False)
+        self.message_user(request, _("Documents unpublished."))
+
+    unpublish.short_description = gettext_lazy("Unpublish selected documents")
+
 
 class TaxonomyForm(MoveNodeForm):
     def save(self, commit=True):

peachjam/migrations/0117_coredocument_published.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2024-01-24 12:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peachjam", "0116_copy_and_delete_old_order_outcome_field_data"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="coredocument",
+            name="published",
+            field=models.BooleanField(default=True, verbose_name="published"),
+        ),
+    ]

peachjam/models/core_document_model.py

@@ -427,6 +427,13 @@ class CoreDocument(PolymorphicModel):
         help_text=_("Allow this document to be indexed by search engine robots."),
     )
 
+    published = models.BooleanField(
+        _("published"),
+        default=True,
+        db_index=True,
+        help_text=_("Is this document published and visible on the website?"),
+    )
+
     # options for the FRBR URI doctypes
     frbr_uri_doctypes = FRBR_URI_DOCTYPES
     labels = models.ManyToManyField(Label, verbose_name=_("labels"), blank=True)

peachjam/views/documents.py

@@ -45,6 +45,9 @@ def dispatch(self, request, *args, **kwargs):
                 return redirect(url)
             raise Http404()
 
+        if not obj.published:
+            raise Http404()
+
         if not exact or portion:
             url = obj.get_absolute_url()
             # this translates from /akn/.../~sec_2 to /akn/.../#sec_2
@@ -53,6 +56,7 @@ def dispatch(self, request, *args, **kwargs):
             return redirect(url)
 
         view_class = registry.views.get(obj.doc_type)
+
         if view_class:
             view = view_class()
             view.setup(request, *args, **kwargs)

peachjam/views/gazette.py

@@ -34,7 +34,7 @@ def group_years(years, locality={}):
 
 
 class GazetteListView(TemplateView):
-    queryset = Gazette.objects.prefetch_related("source_file")
+    queryset = Gazette.objects.exclude(published=False).prefetch_related("source_file")
     template_name = "peachjam/gazette_list.html"
     navbar_link = "gazettes"
 

peachjam/views/generic_views.py

@@ -33,7 +33,11 @@ class DocumentListView(ListView):
     queryset = CoreDocument.objects.prefetch_related("nature", "work")
 
     def get_base_queryset(self):
-        return self.queryset if self.queryset is not None else self.model.objects
+        return (
+            self.queryset.exclude(published=False)
+            if self.queryset is not None
+            else self.model.objects.exclude(published=False)
+        )
 
     def get_queryset(self):
         qs = self.get_base_queryset()

peachjam/views/home.py

@@ -16,11 +16,19 @@ class HomePageView(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        recent_judgments = Judgment.objects.order_by("-date")[:5]
-        recent_documents = GenericDocument.objects.order_by("-date")[:5]
-        recent_instruments = LegalInstrument.objects.order_by("-date")[:5]
-        recent_legislation = Legislation.objects.order_by("-date")[:5]
-        documents_count = CoreDocument.objects.count()
+        recent_judgments = Judgment.objects.exclude(published=False).order_by("-date")[
+            :5
+        ]
+        recent_documents = GenericDocument.objects.exclude(published=False).order_by(
+            "-date"
+        )[:5]
+        recent_instruments = LegalInstrument.objects.exclude(published=False).order_by(
+            "-date"
+        )[:5]
+        recent_legislation = Legislation.objects.exclude(published=False).order_by(
+            "-date"
+        )[:5]
+        documents_count = CoreDocument.objects.exclude(published=False).count()
 
         authors = Author.objects.exclude(
             Q(genericdocument__isnull=True),

peachjam/views/judgment.py

@@ -14,7 +14,9 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         context["court_classes"] = CourtClass.objects.prefetch_related("courts")
-        context["recent_judgments"] = Judgment.objects.order_by("-date")[:30]
+        context["recent_judgments"] = Judgment.objects.exclude(
+            published=False
+        ).order_by("-date")[:30]
         context["doc_type"] = "Judgment"
         return context
 

peachjam_search/documents.py

@@ -116,7 +116,7 @@ class SearchableDocument(Document):
     ]
 
     def should_index_object(self, obj):
-        if isinstance(obj, ExternalDocument):
+        if isinstance(obj, ExternalDocument) or not obj.published:
             return False
         return True