From 064fba5714b5895d0cdfd93af9270b812ddb06df Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 5 May 2026 20:14:29 +0000
Subject: [PATCH 01/10] Add document moderation history view

Adds a public page at /moderation/document/<pk>/history/ listing all
moderator actions ever taken on a specific document. The page is
accessible to all logged-in users, consistent with the existing
transparency philosophy of public_logs and moderation_profile.

An "Historique" button (clock icon) is added to the document viewer
header so any logged-in user can reach the page directly from a document.

https://claude.ai/code/session_01ASo7pRSr4hxD6jm6NrynSi
---
 documents/templates/documents/viewer.html     | 10 +++
 .../moderation/document_history.html          | 66 +++++++++++++++++++
 moderation/urls.py                            |  6 ++
 moderation/views.py                           | 19 ++++++
 4 files changed, 101 insertions(+)
 create mode 100644 moderation/templates/moderation/document_history.html

diff --git a/documents/templates/documents/viewer.html b/documents/templates/documents/viewer.html
index 8c9b2f3e..bf1bcba9 100644
--- a/documents/templates/documents/viewer.html
+++ b/documents/templates/documents/viewer.html
@@ -74,6 +74,16 @@ <h1 class="fs-4 mb-0 d-flex align-items-center gap-1">
                         Modifier
                     </a>
                 {% endif %}
+                <a class="btn btn-outline-secondary btn-sm d-inline-flex align-items-center gap-1"
+                   href="{% url 'document_history' document.pk %}">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                         class="bi bi-clock-history" viewBox="0 0 16 16">
+                        <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
+                        <path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0z"/>
+                        <path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5"/>
+                    </svg>
+                    Historique
+                </a>
 
                 <button data-controller="share" data-share-url="{{ document.get_absolute_url }}"
                         data-action="click->share#share"
diff --git a/moderation/templates/moderation/document_history.html b/moderation/templates/moderation/document_history.html
new file mode 100644
index 00000000..a4338b16
--- /dev/null
+++ b/moderation/templates/moderation/document_history.html
@@ -0,0 +1,66 @@
+{% extends "base.html" %}
+
+{% block title %}Historique — {{ document.name }}{% endblock %}
+
+{% block content %}
+    <div class="container-xl mt-4">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb">
+                <li class="breadcrumb-item"><a href="{% url 'moderation_about' %}">Modération</a></li>
+                <li class="breadcrumb-item"><a href="{% url 'public_logs' %}">Journal</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{{ document.name }}</li>
+            </ol>
+        </nav>
+
+        <div class="mb-4">
+            <h1 class="mb-0">Historique de modération</h1>
+            <p class="text-muted mb-1">
+                <a href="{% url 'document_show' document.pk %}">{{ document.name }}</a>
+                — {{ document.course.slug|upper }} {{ document.course.name }}
+            </p>
+            <p class="text-muted small mb-0">
+                Déposé par {{ document.user.netid }} · {{ document.date|date:"d/m/Y" }}
+            </p>
+        </div>
+
+        <div class="card shadow-sm border-0">
+            <div class="table-responsive">
+                <table class="table table-hover align-middle mb-0">
+                    <thead class="table-light text-muted small text-uppercase">
+                        <tr>
+                            <th class="ps-4">Date</th>
+                            <th>Modérateur</th>
+                            <th>Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for log in logs %}
+                            <tr>
+                                <td class="ps-4 text-muted small" style="white-space: nowrap;">
+                                    {{ log.timestamp|date:"d/m/Y à H:i" }}
+                                </td>
+                                <td>
+                                    <a href="{% url 'moderation_profile' log.user.netid %}">{{ log.user.netid }}</a>
+                                </td>
+                                <td>
+                                    <span class="badge bg-{{ log.action_color }} bg-opacity-10 text-{{ log.action_color }} border border-{{ log.action_color }}">
+                                        {{ log.action_text }}
+                                    </span>
+                                    {% if log.details_text %}
+                                        <div class="mt-1 small text-muted fst-italic">{{ log.details_text }}</div>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% empty %}
+                            <tr>
+                                <td colspan="3" class="text-center text-muted py-5">
+                                    Aucune action de modération enregistrée sur ce document.
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+{% endblock content %}
diff --git a/moderation/urls.py b/moderation/urls.py
index afd4e64e..58a97c4e 100644
--- a/moderation/urls.py
+++ b/moderation/urls.py
@@ -29,4 +29,10 @@
     # --- Public Pages ---
     path("tree/", views.moderation_tree, name="moderation_tree"),
     path("profile/<str:netid>/", views.moderation_profile, name="moderation_profile"),
+    # --- Document History ---
+    path(
+        "document/<int:pk>/history/",
+        views.document_history,
+        name="document_history",
+    ),
 ]
diff --git a/moderation/views.py b/moderation/views.py
index 163781a6..268b69e9 100644
--- a/moderation/views.py
+++ b/moderation/views.py
@@ -4,6 +4,7 @@
 from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
 from django.db.models import Count, Q
@@ -11,6 +12,7 @@
 from django.urls import reverse
 from django.views.decorators.http import require_POST
 
+from documents.models import Document
 from moderation.forms import (
     AddModeratorForm,
     ProcessRepresentativeRequestForm,
@@ -331,3 +333,20 @@ def moderation_profile(request, netid):
 def moderation_about(request):
     """Public page explaining the moderation system."""
     return render(request, "moderation/about.html")
+
+
+@login_required
+def document_history(request, pk):
+    """Moderation history for a single document — all actions by all moderators."""
+    document = get_object_or_404(Document, pk=pk)
+    content_type = ContentType.objects.get_for_model(Document)
+    logs = (
+        ModerationLog.objects.filter(content_type=content_type, object_id=pk)
+        .select_related("user")
+        .order_by("-timestamp")
+    )
+    return render(
+        request,
+        "moderation/document_history.html",
+        {"document": document, "logs": logs},
+    )

From 5978630e2c0c1425e8f52378fc3df18f3e75c5f7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 5 May 2026 20:19:58 +0000
Subject: [PATCH 02/10] Align document history URL and view name with
 moderation conventions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- URL: /moderation/document/<pk>/history/ → /moderation/document/<pk>/
- Name: document_history → moderation_document

https://claude.ai/code/session_01ASo7pRSr4hxD6jm6NrynSi
---
 documents/templates/documents/viewer.html | 2 +-
 moderation/urls.py                        | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/documents/templates/documents/viewer.html b/documents/templates/documents/viewer.html
index bf1bcba9..bccc77b4 100644
--- a/documents/templates/documents/viewer.html
+++ b/documents/templates/documents/viewer.html
@@ -75,7 +75,7 @@ <h1 class="fs-4 mb-0 d-flex align-items-center gap-1">
                     </a>
                 {% endif %}
                 <a class="btn btn-outline-secondary btn-sm d-inline-flex align-items-center gap-1"
-                   href="{% url 'document_history' document.pk %}">
+                   href="{% url 'moderation_document' document.pk %}">
                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
                          class="bi bi-clock-history" viewBox="0 0 16 16">
                         <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
diff --git a/moderation/urls.py b/moderation/urls.py
index 58a97c4e..d373e6ed 100644
--- a/moderation/urls.py
+++ b/moderation/urls.py
@@ -30,9 +30,5 @@
     path("tree/", views.moderation_tree, name="moderation_tree"),
     path("profile/<str:netid>/", views.moderation_profile, name="moderation_profile"),
     # --- Document History ---
-    path(
-        "document/<int:pk>/history/",
-        views.document_history,
-        name="document_history",
-    ),
+    path("document/<int:pk>/", views.document_history, name="moderation_document"),
 ]

From af8ce39cd1515ca043a3d47353011b7333d56dee Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Mon, 11 May 2026 22:27:16 +0200
Subject: [PATCH 03/10] Only show document history button when moderation
 history exists

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 documents/templates/documents/viewer.html | 22 ++++++++++++----------
 documents/views.py                        |  5 +++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/documents/templates/documents/viewer.html b/documents/templates/documents/viewer.html
index bccc77b4..7447827c 100644
--- a/documents/templates/documents/viewer.html
+++ b/documents/templates/documents/viewer.html
@@ -74,16 +74,18 @@ <h1 class="fs-4 mb-0 d-flex align-items-center gap-1">
                         Modifier
                     </a>
                 {% endif %}
-                <a class="btn btn-outline-secondary btn-sm d-inline-flex align-items-center gap-1"
-                   href="{% url 'moderation_document' document.pk %}">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                         class="bi bi-clock-history" viewBox="0 0 16 16">
-                        <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
-                        <path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0z"/>
-                        <path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5"/>
-                    </svg>
-                    Historique
-                </a>
+                {% if has_moderation_history %}
+                    <a class="btn btn-outline-secondary btn-sm d-inline-flex align-items-center gap-1"
+                       href="{% url 'moderation_document' document.pk %}">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                             class="bi bi-clock-history" viewBox="0 0 16 16">
+                            <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
+                            <path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0z"/>
+                            <path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5"/>
+                        </svg>
+                        Historique
+                    </a>
+                {% endif %}
 
                 <button data-controller="share" data-share-url="{{ document.get_absolute_url }}"
                         data-action="click->share#share"
diff --git a/documents/views.py b/documents/views.py
index 504aed10..959c854a 100644
--- a/documents/views.py
+++ b/documents/views.py
@@ -4,6 +4,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import F
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
@@ -234,6 +235,10 @@ def document_show(request, pk):
         "document": document,
         "user_vote": document.vote_set.filter(user=request.user).first(),
         "form": DocumentReportForm(),
+        "has_moderation_history": ModerationLog.objects.filter(
+            content_type=ContentType.objects.get_for_model(Document),
+            object_id=document.pk,
+        ).exists(),
     }
 
     return render(request, "documents/viewer.html", context)

From 02a1ba52b48a90aaa5a3f2ed1ab0c557d1b6eb8b Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Mon, 11 May 2026 22:31:21 +0200
Subject: [PATCH 04/10] Improve document history display with readable field
 labels and old/new values

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 moderation/models.py                          | 20 +++++++++++++++++--
 .../moderation/document_history.html          | 14 +++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/moderation/models.py b/moderation/models.py
index 6a042ebe..a87b462f 100644
--- a/moderation/models.py
+++ b/moderation/models.py
@@ -66,7 +66,12 @@ class Meta:
     def __str__(self):
         return f"{self.user.get_short_name()} a fait une action le {self.timestamp.strftime('%d/%m/%Y')}"
 
-    ### Action translation logic ###
+    FIELD_LABELS = {
+        "name": "titre",
+        "description": "description",
+        "tags": "tags",
+        "hidden": "visibilité",
+    }
 
     @property
     def action_text(self):
@@ -83,7 +88,18 @@ def action_text(self):
             return "a refusé la demande de"
         elif self.target_field == "reupload":
             return "a re-uploadé"
-        return f"a modifié '{self.target_field}' sur"
+        label = self.FIELD_LABELS.get(self.target_field, self.target_field)
+        return f"a modifié '{label}' sur"
+
+    @property
+    def document_action_text(self):
+        """Action text for document history context (no trailing 'sur')."""
+        if self.target_field == "reupload":
+            return "re-upload"
+        if self.target_field == "hidden":
+            return "caché" if str(self.new_value) == "True" else "rendu visible"
+        label = self.FIELD_LABELS.get(self.target_field, self.target_field)
+        return f"modifié {label}"
 
     @property
     def action_color(self):
diff --git a/moderation/templates/moderation/document_history.html b/moderation/templates/moderation/document_history.html
index a4338b16..90c771d4 100644
--- a/moderation/templates/moderation/document_history.html
+++ b/moderation/templates/moderation/document_history.html
@@ -31,6 +31,7 @@ <h1 class="mb-0">Historique de modération</h1>
                             <th class="ps-4">Date</th>
                             <th>Modérateur</th>
                             <th>Action</th>
+                            <th>Détails</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -44,16 +45,21 @@ <h1 class="mb-0">Historique de modération</h1>
                                 </td>
                                 <td>
                                     <span class="badge bg-{{ log.action_color }} bg-opacity-10 text-{{ log.action_color }} border border-{{ log.action_color }}">
-                                        {{ log.action_text }}
+                                        {{ log.document_action_text }}
                                     </span>
-                                    {% if log.details_text %}
-                                        <div class="mt-1 small text-muted fst-italic">{{ log.details_text }}</div>
+                                </td>
+                                <td class="small text-muted">
+                                    {% if log.old_value and log.new_value and log.target_field != "reupload" %}
+                                        <span class="text-decoration-line-through">{{ log.old_value|truncatewords:15 }}</span>
+                                        &rarr; {{ log.new_value|truncatewords:15 }}
+                                    {% elif log.target_field == "reupload" %}
+                                        {{ log.new_value }}
                                     {% endif %}
                                 </td>
                             </tr>
                         {% empty %}
                             <tr>
-                                <td colspan="3" class="text-center text-muted py-5">
+                                <td colspan="4" class="text-center text-muted py-5">
                                     Aucune action de modération enregistrée sur ce document.
                                 </td>
                             </tr>

From 5ef24fe21cdb6f4469764a20674b1ffad9e570ee Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Mon, 11 May 2026 22:33:45 +0200
Subject: [PATCH 05/10] Track staff pick changes in moderation log and clean up
 history details

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 documents/views.py                                    | 2 ++
 moderation/models.py                                  | 7 +++++++
 moderation/templates/moderation/document_history.html | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/documents/views.py b/documents/views.py
index 959c854a..4d607816 100644
--- a/documents/views.py
+++ b/documents/views.py
@@ -129,6 +129,7 @@ def document_edit(request, pk):
         old_name = doc.name
         old_description = doc.description
         old_tags = list(doc.tags.all())
+        old_staff_pick = doc.staff_pick
 
         form = DocumentForm(request.POST, instance=doc)
 
@@ -144,6 +145,7 @@ def document_edit(request, pk):
                             form.cleaned_data["description"],
                         ),
                         "tags": (old_tags, form.cleaned_data["tags"]),
+                        "staff_pick": (old_staff_pick, form.cleaned_data["staff_pick"]),
                     },
                 )
 
diff --git a/moderation/models.py b/moderation/models.py
index a87b462f..fa22bf06 100644
--- a/moderation/models.py
+++ b/moderation/models.py
@@ -71,6 +71,7 @@ def __str__(self):
         "description": "description",
         "tags": "tags",
         "hidden": "visibilité",
+        "staff_pick": "staff pick",
     }
 
     @property
@@ -98,6 +99,12 @@ def document_action_text(self):
             return "re-upload"
         if self.target_field == "hidden":
             return "caché" if str(self.new_value) == "True" else "rendu visible"
+        if self.target_field == "staff_pick":
+            return (
+                "ajouté staff pick"
+                if str(self.new_value) == "True"
+                else "retiré staff pick"
+            )
         label = self.FIELD_LABELS.get(self.target_field, self.target_field)
         return f"modifié {label}"
 
diff --git a/moderation/templates/moderation/document_history.html b/moderation/templates/moderation/document_history.html
index 90c771d4..bdf60a94 100644
--- a/moderation/templates/moderation/document_history.html
+++ b/moderation/templates/moderation/document_history.html
@@ -49,11 +49,11 @@ <h1 class="mb-0">Historique de modération</h1>
                                     </span>
                                 </td>
                                 <td class="small text-muted">
-                                    {% if log.old_value and log.new_value and log.target_field != "reupload" %}
+                                    {% if log.target_field == "reupload" %}
+                                        {{ log.new_value }}
+                                    {% elif log.target_field != "hidden" and log.target_field != "staff_pick" and log.old_value and log.new_value %}
                                         <span class="text-decoration-line-through">{{ log.old_value|truncatewords:15 }}</span>
                                         &rarr; {{ log.new_value|truncatewords:15 }}
-                                    {% elif log.target_field == "reupload" %}
-                                        {{ log.new_value }}
                                     {% endif %}
                                 </td>
                             </tr>

From 02f5c31b367fa61397fc33c8a9ca56b6c5fa6a25 Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Mon, 11 May 2026 22:35:23 +0200
Subject: [PATCH 06/10] Add spaces after commas when serializing list values in
 moderation log

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 moderation/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/moderation/models.py b/moderation/models.py
index fa22bf06..5372066b 100644
--- a/moderation/models.py
+++ b/moderation/models.py
@@ -149,11 +149,11 @@ def track(cls, user, content_object: models.Model, values: dict[str, tuple]):
             if isinstance(old, (collections.abc.Iterable, QuerySet)) and not isinstance(  # type: ignore
                 old, str
             ):
-                old = ",".join([str(x) for x in old])  # noqa: PLW2901
+                old = ", ".join([str(x) for x in old])  # noqa: PLW2901
             if isinstance(new, (collections.abc.Iterable, QuerySet)) and not isinstance(  # type: ignore
                 new, str
             ):
-                new = ",".join([str(x) for x in new])  # noqa: PLW2901
+                new = ", ".join([str(x) for x in new])  # noqa: PLW2901
             if old != new:
                 cls.objects.create(
                     user=user,

From 2630c883ff94b7a5854ce7027018911dce4d4af1 Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Mon, 11 May 2026 22:37:39 +0200
Subject: [PATCH 07/10] Add .playwright-mcp/ to .gitignore

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1d16fc08..3c62ebc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ docker/.*
 .env
 programs.json
 courses.json
+.playwright-mcp/

From d41d25d311993731a72035f3955d9a59c0c045e8 Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Mon, 11 May 2026 22:46:44 +0200
Subject: [PATCH 08/10] Polish document moderation history wording

---
 .../templates/documents/document_edit.html    |  4 +--
 documents/templates/documents/viewer.html     |  2 +-
 moderation/models.py                          | 28 ++++++++++++++-----
 moderation/templates/moderation/about.html    |  4 +--
 moderation/urls.py                            |  6 +++-
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/documents/templates/documents/document_edit.html b/documents/templates/documents/document_edit.html
index 7873ab57..74031977 100644
--- a/documents/templates/documents/document_edit.html
+++ b/documents/templates/documents/document_edit.html
@@ -39,10 +39,10 @@ <h5 class="card-header">Modération</h5>
                                 Staff pick
                             </label>
                             <div class="form-text">
-                                En tant que modérateur, tu peux marquer ce document comme un "staff pick".<br/>
+                                En tant que modérateur, tu peux marquer ce document comme staff pick.<br/>
                                 Cela signifie que l'équipe de modération de DocHub considère ce document comme
                                 étant d'une grande qualité et méritant d'être mis en avant.<br/>
-                                Il apparaitra dans la liste des documents avec cette icône :
+                                Il apparaîtra dans la liste des documents avec cette icône :
                                 <svg title="Staff pick" xmlns="http://www.w3.org/2000/svg"
                                      width="16" height="16" fill="currentColor"
                                      class="bi bi-patch-check-fill" viewBox="0 0 16 16">
diff --git a/documents/templates/documents/viewer.html b/documents/templates/documents/viewer.html
index 7447827c..124c5ab2 100644
--- a/documents/templates/documents/viewer.html
+++ b/documents/templates/documents/viewer.html
@@ -76,7 +76,7 @@ <h1 class="fs-4 mb-0 d-flex align-items-center gap-1">
                 {% endif %}
                 {% if has_moderation_history %}
                     <a class="btn btn-outline-secondary btn-sm d-inline-flex align-items-center gap-1"
-                       href="{% url 'moderation_document' document.pk %}">
+                       href="{% url 'moderation_document_history' document.pk %}">
                         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
                              class="bi bi-clock-history" viewBox="0 0 16 16">
                             <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
diff --git a/moderation/models.py b/moderation/models.py
index 5372066b..54c6be29 100644
--- a/moderation/models.py
+++ b/moderation/models.py
@@ -88,7 +88,13 @@ def action_text(self):
         elif self.target_field == "action_rejeter":
             return "a refusé la demande de"
         elif self.target_field == "reupload":
-            return "a re-uploadé"
+            return "a remplacé le fichier de"
+        elif self.target_field == "staff_pick":
+            return (
+                "a ajouté un staff pick sur"
+                if str(self.new_value) == "True"
+                else "a retiré le staff pick de"
+            )
         label = self.FIELD_LABELS.get(self.target_field, self.target_field)
         return f"a modifié '{label}' sur"
 
@@ -96,17 +102,25 @@ def action_text(self):
     def document_action_text(self):
         """Action text for document history context (no trailing 'sur')."""
         if self.target_field == "reupload":
-            return "re-upload"
+            return "fichier remplacé"
         if self.target_field == "hidden":
-            return "caché" if str(self.new_value) == "True" else "rendu visible"
+            return (
+                "document caché"
+                if str(self.new_value) == "True"
+                else "document rendu visible"
+            )
         if self.target_field == "staff_pick":
             return (
-                "ajouté staff pick"
+                "staff pick ajouté"
                 if str(self.new_value) == "True"
-                else "retiré staff pick"
+                else "staff pick retiré"
             )
-        label = self.FIELD_LABELS.get(self.target_field, self.target_field)
-        return f"modifié {label}"
+        field_actions = {
+            "name": "titre modifié",
+            "description": "description modifiée",
+            "tags": "tags modifiés",
+        }
+        return field_actions.get(self.target_field, f"{self.target_field} modifié")
 
     @property
     def action_color(self):
diff --git a/moderation/templates/moderation/about.html b/moderation/templates/moderation/about.html
index 5f5a651f..c21aa8ee 100644
--- a/moderation/templates/moderation/about.html
+++ b/moderation/templates/moderation/about.html
@@ -14,8 +14,8 @@ <h2 id="role">Que peuvent faire les modérateur·trices ?</h2>
         <ul class="mb-4">
             <li>Modifier le titre, la description et les tags de n'importe quel document</li>
             <li>Cacher ou rendre visible un document (par exemple si le contenu n'est pas approprié)</li>
-            <li>Re-uploader une nouvelle version d'un document</li>
-            <li>Marquer un document comme "Staff pick"</li>
+            <li>Remplacer le fichier d'un document</li>
+            <li>Marquer un document de qualité comme staff pick</li>
         </ul>
 
         <h2 id="transparence">Transparence</h2>
diff --git a/moderation/urls.py b/moderation/urls.py
index d373e6ed..e7a14094 100644
--- a/moderation/urls.py
+++ b/moderation/urls.py
@@ -30,5 +30,9 @@
     path("tree/", views.moderation_tree, name="moderation_tree"),
     path("profile/<str:netid>/", views.moderation_profile, name="moderation_profile"),
     # --- Document History ---
-    path("document/<int:pk>/", views.document_history, name="moderation_document"),
+    path(
+        "document/<int:pk>/",
+        views.document_history,
+        name="moderation_document_history",
+    ),
 ]

From b0a3f38227193af13a2f438cc871950b378063c7 Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Mon, 11 May 2026 22:55:34 +0200
Subject: [PATCH 09/10] Fix staff pick authorization

---
 documents/views.py                  | 38 +++++++++++----
 moderation/tests/test_moderation.py | 71 +++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/documents/views.py b/documents/views.py
index 4d607816..359cff0a 100644
--- a/documents/views.py
+++ b/documents/views.py
@@ -27,6 +27,13 @@
 from moderation.models import ModerationLog
 
 
+def _document_form_for_user(user, document, *args, **kwargs):
+    form = DocumentForm(*args, instance=document, **kwargs)
+    if not user.moderation_perm(document):
+        form.fields.pop("staff_pick", None)
+    return form
+
+
 @login_required
 @slug_redirect
 def upload_file(request, slug):
@@ -131,21 +138,36 @@ def document_edit(request, pk):
         old_tags = list(doc.tags.all())
         old_staff_pick = doc.staff_pick
 
-        form = DocumentForm(request.POST, instance=doc)
+        can_staff_pick = request.user.moderation_perm(doc)
+        form = _document_form_for_user(request.user, doc, request.POST)
 
         if form.is_valid():
             if request.user != doc.user:
+                values = {
+                    "name": (old_name, form.cleaned_data["name"]),
+                    "description": (
+                        old_description,
+                        form.cleaned_data["description"],
+                    ),
+                    "tags": (old_tags, form.cleaned_data["tags"]),
+                }
+                if can_staff_pick:
+                    values["staff_pick"] = (
+                        old_staff_pick,
+                        form.cleaned_data["staff_pick"],
+                    )
+                ModerationLog.track(
+                    user=request.user, content_object=doc, values=values
+                )
+            elif can_staff_pick:
                 ModerationLog.track(
                     user=request.user,
                     content_object=doc,
                     values={
-                        "name": (old_name, form.cleaned_data["name"]),
-                        "description": (
-                            old_description,
-                            form.cleaned_data["description"],
+                        "staff_pick": (
+                            old_staff_pick,
+                            form.cleaned_data["staff_pick"],
                         ),
-                        "tags": (old_tags, form.cleaned_data["tags"]),
-                        "staff_pick": (old_staff_pick, form.cleaned_data["staff_pick"]),
                     },
                 )
 
@@ -158,7 +180,7 @@ def document_edit(request, pk):
             return HttpResponseRedirect(reverse("document_show", args=[doc.id]))
 
     else:
-        form = DocumentForm(instance=doc)
+        form = _document_form_for_user(request.user, doc)
 
     return render(
         request,
diff --git a/moderation/tests/test_moderation.py b/moderation/tests/test_moderation.py
index 4b915707..ea7110cc 100644
--- a/moderation/tests/test_moderation.py
+++ b/moderation/tests/test_moderation.py
@@ -191,6 +191,77 @@ def test_log_on_document_edit_by_moderator(client, moderator, document):
     assert log.user == moderator
 
 
+def test_document_owner_cannot_forge_staff_pick(client, regular_user, course):
+    """Prevent owners from setting the moderator-only staff_pick field by forging POST data."""
+    document = Document.objects.create(
+        user=regular_user,
+        course=course,
+        name="Student Doc",
+        staff_pick=False,
+    )
+
+    login(client, regular_user)
+    resp = client.post(
+        reverse("document_edit", args=[document.id]),
+        {"name": "Student Doc", "description": "", "staff_pick": "on"},
+    )
+
+    assert resp.status_code == 302
+    document.refresh_from_db()
+    assert document.staff_pick is False
+    assert not ModerationLog.objects.filter(target_field="staff_pick").exists()
+
+
+def test_document_owner_edit_preserves_existing_staff_pick(
+    client, regular_user, course
+):
+    """Prevent owner edits from clearing staff_pick because the hidden checkbox is absent from the form."""
+    document = Document.objects.create(
+        user=regular_user,
+        course=course,
+        name="Student Doc",
+        staff_pick=True,
+    )
+
+    login(client, regular_user)
+    resp = client.post(
+        reverse("document_edit", args=[document.id]),
+        {"name": "Updated Student Doc", "description": ""},
+    )
+
+    assert resp.status_code == 302
+    document.refresh_from_db()
+    assert document.name == "Updated Student Doc"
+    assert document.staff_pick is True
+    assert not ModerationLog.objects.filter(target_field="staff_pick").exists()
+
+
+def test_moderator_staff_pick_change_is_logged_on_own_document(
+    client, moderator, course
+):
+    """Ensure allowed staff_pick changes remain auditable even on a moderator's own document."""
+    document = Document.objects.create(
+        user=moderator,
+        course=course,
+        name="Moderator Doc",
+        staff_pick=False,
+    )
+
+    login(client, moderator)
+    resp = client.post(
+        reverse("document_edit", args=[document.id]),
+        {"name": "Moderator Doc", "description": "", "staff_pick": "on"},
+    )
+
+    assert resp.status_code == 302
+    document.refresh_from_db()
+    assert document.staff_pick is True
+    log = ModerationLog.objects.get(target_field="staff_pick")
+    assert log.user == moderator
+    assert log.old_value == "False"
+    assert log.new_value == "True"
+
+
 def test_public_logs_view(client, moderator, regular_user):
     ModerationLog.objects.create(
         user=moderator,

From 34b8601378d5ac867bacef9aa7185132c68fe4c3 Mon Sep 17 00:00:00 2001
From: Nikita Marchant <nikita.marchant@gmail.com>
Date: Fri, 15 May 2026 22:46:20 +0200
Subject: [PATCH 10/10] update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36eae38a..c7926d11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This page tries to contain all use facing changes made on DocHub.
 
+# Unreleased
+
+ * Add document moderation history view showing all actions taken on a document
+
 # 2026.5.1
 
 Moderation: