feat(meetings): Use "Decline and Delete" for slide disapprovals (#9842)

Spectre17 · web-flow · commit a3836949eb82 · 2025-11-03T18:11:21.000-05:00
* feat(meetings): Use "Decline and Delete" for slide disapprovals Changes use of "disapprove" and "rejected" to "decline" and "declined" when dealing with slides that have been submitted for approval. Responds to #9242 * feat(meetings): Use "Decline and Delete" for slide disapprovals Now with a fix for a test that broke owing to the original change. Still responds to #9242
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
@@ -7148,7 +7148,7 @@ def test_disapprove_proposed_slides(self):
             self.assertFalse(exists_in_storage("staging", submission.filename))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertRegex(r.content.decode(), r"These\s+slides\s+have\s+already\s+been\s+rejected")
+        self.assertRegex(r.content.decode(), r"These\s+slides\s+have\s+already\s+been\s+declined")
 
     @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
     @patch("ietf.meeting.views.SlidesManager")
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
@@ -5304,7 +5304,7 @@ def approve_proposed_slides(request, slidesubmission_id, num):
             if request.POST.get('approve'):
                 # Ensure that we have a file to approve.  The system gets cranky otherwise.
                 if submission.filename is None or submission.filename == '' or not os.path.isfile(submission.staged_filepath()):
-                    return HttpResponseNotFound("The slides you attempted to approve could not be found.  Please disapprove and delete them instead.")
+                    return HttpResponseNotFound("The slides you attempted to approve could not be found.  Please decline and delete them instead.")
                 title = form.cleaned_data['title']
                 if existing_doc:
                    doc = Document.objects.get(name=name)
diff --git a/ietf/templates/meeting/approve_proposed_slides.html b/ietf/templates/meeting/approve_proposed_slides.html
@@ -34,6 +34,6 @@ <h2>
         <button type="submit"
                 class="btn btn-warning"
                 name="disapprove"
-                value="disapprove">Disapprove and Delete</button>
+                value="disapprove">Decline and Delete</button>
     </form>
-{% endblock %}
+{% endblock %}
diff --git a/ietf/templates/meeting/previously_approved_slides.html b/ietf/templates/meeting/previously_approved_slides.html
@@ -11,15 +11,15 @@ <h1 class="mb-3">
         {% if submission.status.slug == 'approved' %}
             approved
         {% else %}
-            rejected
+            declined
         {% endif %}
     </h1>
     <p>
         The slides from {{ submission.submitter }} have already been
         {% if submission.status.slug == 'approved' %}
             approved.
         {% else %}
-            rejected.
+            declined.
         {% endif %}
         No further action is needed.
     </p>
@@ -33,4 +33,4 @@ <h1 class="mb-3">
             return to this meeting session
         </a>.
     </p>
-{% endblock %}
+{% endblock %}
