Update published delete redirect

app/admin_ui/views/published.py

@@ -127,5 +127,11 @@ def dispatch(self, *args, **kwargs):
         )
         change_object.save()
         return redirect(
-            reverse("change-list", kwargs={'model': self._model_config['singular_snake_case']})
+            reverse(
+                "canonical-draft-edit",
+                kwargs={
+                    'model': self._model_config['singular_snake_case'],
+                    'canonical_uuid': kwargs["canonical_uuid"],
+                },
+            )
         )

app/admin_ui/views/v2.py

@@ -227,16 +227,18 @@ def get_queryset(self):
         return Change.objects.all()
 
     def get(self, request, *args, **kwargs):
-        messages.add_message(
-            request,
-            messages.WARNING,
-            "Deletion in progress. Only after admin approval will the published version be removed.",
-        )
         self.object = self.get_object()
         in_progress_drafts = Change.objects.related_in_progress_drafts(
             self.kwargs["canonical_uuid"]
         )
 
+        # Show a warning message if this is a delete draft that is staged for publication
+        if in_progress_drafts.filter(action=Change.Actions.DELETE).exists():
+            messages.add_message(
+                request,
+                messages.WARNING,
+                "Deletion in progress. Only after admin approval will the published version be removed.",
+            )
         published_drafts = Change.objects.related_drafts(self.kwargs["canonical_uuid"]).filter(
             status=Change.Statuses.PUBLISHED
         )