🚸 Always allow mods to change request status

okfde · Jan 27, 2025 · 099e0f2 · 099e0f2
1 parent aeeac1c
commit 099e0f2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/froide/foirequest/models/request.py b/froide/foirequest/models/request.py
@@ -742,9 +742,6 @@ def has_been_refused(self):
     def awaits_classification(self):
         return self.status == Status.AWAITING_CLASSIFICATION
 
-    def moderate_classification(self):
-        return self.awaits_classification() and self.available_for_moderator_action()
-
     def available_for_moderator_action(self):
         ago = timezone.now() - MODERATOR_CLASSIFICATION_OFFSET
         return self.last_message < ago

diff --git a/froide/foirequest/templates/foirequest/header/info-box.html b/froide/foirequest/templates/foirequest/header/info-box.html
@@ -26,7 +26,7 @@ <h3 class="h5 info-box__title">{{ object.readable_status }}</h3>
     {# body  #}
     <div class="info-box__body">
         {# edit button #}
-        {% if object.moderate_classification and object|can_moderate_foirequest:request or object|can_write_foirequest:request %}
+        {% if object|can_moderate_foirequest:request or object|can_write_foirequest:request %}
             <div id="set-status" class="bg-primary-subtle px-4 py-2 d-print-none">
                 <a href="#" class="info-box__edit-button">
                     <span class="{% if active_tab == 'set-status' %}d-none{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> {% trans "Edit request status" %}</span>
@@ -208,7 +208,7 @@ <h3 class="h5 info-box__title">{{ object.readable_status }}</h3>
             </li>
         </ul>
         {# edit interface #}
-        {% if object.moderate_classification and object|can_moderate_foirequest:request or object|can_write_foirequest:request %}
+        {% if object|can_moderate_foirequest:request or object|can_write_foirequest:request %}
             <div class="info-box__edit-panel px-4 mt-2 mb-4 {% if active_tab != 'set-status' %}d-none{% endif %}">
                 <form class="disable-submit"
                       method="post"

diff --git a/froide/foirequest/views/request_actions.py b/froide/foirequest/views/request_actions.py
@@ -107,9 +107,6 @@ def set_status(request, slug):
     if not can_write_foirequest(foirequest, request):
         if not can_moderate_foirequest(foirequest, request):
             return render_403(request)
-        else:
-            if not foirequest.moderate_classification():
-                return render_403(request)
 
     form = FoiRequestStatusForm(request.POST, foirequest=foirequest)
     if form.is_valid():