Merge pull request #2711 from carpentries/feature/2710-allow-editing-…

…cancelled-emails [Emails] Allow editing cancelled emails
carpentries · Nov 10, 2024 · 6d21bc1 · 6d21bc1
2 parents bec573f + afad78c
commit 6d21bc1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/amy/emails/models.py b/amy/emails/models.py
@@ -128,6 +128,7 @@ class ScheduledEmailStatus(models.TextChoices):
     "edit": [
         ScheduledEmailStatus.SCHEDULED,
         ScheduledEmailStatus.FAILED,
+        ScheduledEmailStatus.CANCELLED,
     ],
     "reschedule": [
         ScheduledEmailStatus.SCHEDULED,

diff --git a/amy/emails/tests/test_template_tags.py b/amy/emails/tests/test_template_tags.py
@@ -33,4 +33,4 @@ def test_allowed_actions_for_status__specific_actions(self) -> None:
         result2 = allowed_actions_for_status(ScheduledEmailStatus.CANCELLED)
         # Assert
         self.assertEqual(result1, [])
-        self.assertEqual(result2, ["reschedule"])
+        self.assertEqual(result2, ["edit", "reschedule"])
diff --git a/amy/emails/tests/test_views.py b/amy/emails/tests/test_views.py
@@ -517,7 +517,7 @@ def test_disallowed_email_statuses(self) -> None:
                 for state in [
                     ScheduledEmailStatus.LOCKED,
                     ScheduledEmailStatus.RUNNING,
-                    ScheduledEmailStatus.CANCELLED,
+                    ScheduledEmailStatus.SUCCEEDED,
                 ]
             ]
         )

diff --git a/amy/templates/emails/scheduled_email_detail.html b/amy/templates/emails/scheduled_email_detail.html
@@ -20,7 +20,7 @@ <h1>
     {% if "edit" in available_status_actions %}
     <a class="btn btn-primary" href="{% url 'scheduledemail_edit' scheduled_email.id %}">Edit</a>
     {% else %}
-    <span class="d-inline-block" tabindex="0" data-toggle="tooltip" title="You can only edit emails that are in the 'scheduled', 'failed' or 'succeeded' states.">
+    <span class="d-inline-block" tabindex="0" data-toggle="tooltip" title="You can only edit emails that are in the 'scheduled', 'failed' or 'cancelled' states.">
       <a class="btn btn-primary disabled" style="pointer-events:none" disabled href="#">Edit</a>
     </span>
     {% endif %}