[carpentries#2065] Improve email (un)schedule messages

CSS and message content slightly changed.

amy/autoemails/base_views.py

@@ -120,11 +120,10 @@ def add(
                     request,
                     format_html(
                         "New email ({}) was scheduled to run "
-                        '<relative-time datetime="{}">{}</relative-time>: '
-                        '<a href="{}">{}</a>.',
+                        '<relative-time datetime="{}"></relative-time>: '
+                        '<a href="{}"><code>{}</code></a>.',
                         trigger.get_action_display(),
                         scheduled_at.isoformat(),
-                        "{:%Y-%m-%d %H:%M}".format(scheduled_at),
                         reverse("admin:autoemails_rqjob_preview", args=[rqj.pk]),
                         job.id,
                     ),
@@ -205,8 +204,8 @@ def remove(
                     messages.info(
                         request,
                         format_html(
-                            "Scheduled email {} was removed because action "
-                            "conditions have changed. "
+                            "Scheduled email <code>{}</code> was removed because "
+                            "action conditions have changed. "
                             '<a href="{}">See other scheduled jobs</a>.',
                             job,
                             reverse("admin:autoemails_rqjob_changelist"),

amy/static/css/amy.css

@@ -201,3 +201,8 @@ select[readonly].select2-hidden-accessible + .select2-container
     margin-top: 0;
     margin-bottom: 1rem;
 }
+
+/* RELATIVE TIME */
+relative-time {
+    text-decoration: dotted underline 10%;
+}

amy/workshops/tests/test_event.py

@@ -1635,7 +1635,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_edit", args=[event.slug]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -1748,7 +1750,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_delete", args=[event.slug]), follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -1988,7 +1992,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_edit", args=[event.slug]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2143,7 +2149,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_delete", args=[event.slug]), follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2350,7 +2358,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_edit", args=[event.slug]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2478,7 +2488,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_delete", args=[event.slug]), follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2691,7 +2703,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_edit", args=[event.slug]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2823,7 +2837,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("event_delete", args=[event.slug]), follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 

amy/workshops/tests/test_tasks.py

@@ -872,7 +872,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("task_edit", args=[task.pk]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -1006,7 +1008,9 @@ def test_job_unscheduled(self):
 
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
 
         # task is gone
         with self.assertRaises(Task.DoesNotExist):
@@ -1322,7 +1326,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("task_edit", args=[task.pk]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -1458,7 +1464,9 @@ def test_job_unscheduled(self):
 
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
 
         # task is gone
         with self.assertRaises(Task.DoesNotExist):
@@ -1785,7 +1793,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("task_edit", args=[self.host1_task.pk]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -1928,7 +1938,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("task_delete", args=[self.host1_task.pk]), follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2183,7 +2195,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("task_edit", args=[self.instructor_task.pk]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2291,7 +2305,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("task_delete", args=[self.instructor_task.pk]), follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2476,7 +2492,9 @@ def test_job_unscheduled(self):
         response = self.client.post(reverse("task_add"), data, follow=True)
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
 
         # ensure the event doesn't pass checks anymore
         self.test_event.refresh_from_db()
@@ -2654,7 +2672,9 @@ def test_job_unscheduled(self):
         response = self.client.post(
             reverse("task_edit", args=[self.instructor_task.pk]), data, follow=True
         )
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
 
@@ -2844,7 +2864,9 @@ def test_job_unscheduled(self):
         )
         # with open('test.html', 'w', encoding='utf-8') as f:
         #     f.write(response.content.decode('utf-8'))
-        self.assertContains(response, f"Scheduled email {rqjob.job_id} was removed")
+        self.assertContains(
+            response, f"Scheduled email <code>{rqjob.job_id}</code> was removed"
+        )
 
         # ensure the event doesn't pass checks anymore
         self.test_event.refresh_from_db()