Fix #66: Combine success messages after newsletter actions

Author: pratyushjha06

wagtail_newsletter/actions.py

@@ -7,8 +7,7 @@
 from . import campaign_backends, forms
 from .models import NewsletterPageMixin
 
-
-def save_campaign(request, page: NewsletterPageMixin) -> None:
+def save_campaign(request, page: NewsletterPageMixin, message_user: bool = True) -> None:
     backend = campaign_backends.get_backend()
     revision = page.latest_revision
     version = cast(NewsletterPageMixin, revision.as_object())
@@ -39,10 +38,10 @@ def save_campaign(request, page: NewsletterPageMixin) -> None:
         content_changed=True,
     )
 
-    messages.success(
-        request, f"Newsletter campaign {subject!r} has been saved to {backend.name}"
-    )
-
+    if message_user:
+        messages.success(
+            request, f"Newsletter campaign {subject!r} has been saved to {backend.name}"
+        )
 
 def send_test_email(request, page: NewsletterPageMixin) -> None:
     form = forms.SendTestEmailForm(request.POST, prefix="newsletter-test")
@@ -54,7 +53,7 @@ def send_test_email(request, page: NewsletterPageMixin) -> None:
 
     email = form.cleaned_data["email"]
 
-    save_campaign(request, page)
+    save_campaign(request, page, message_user=False)
 
     backend = campaign_backends.get_backend()
 
@@ -72,9 +71,8 @@ def send_test_email(request, page: NewsletterPageMixin) -> None:
 
     messages.success(request, f"Test message sent to {email!r}")
 
-
 def send_campaign(request, page: NewsletterPageMixin) -> None:
-    save_campaign(request, page)
+    save_campaign(request, page, message_user=False)
 
     backend = campaign_backends.get_backend()
 
@@ -89,7 +87,6 @@ def send_campaign(request, page: NewsletterPageMixin) -> None:
 
     messages.success(request, "Newsletter campaign is now sending")
 
-
 def schedule_campaign(request, page: NewsletterPageMixin) -> None:
     form = forms.ScheduleCampaignForm(request.POST, prefix="newsletter-schedule")
     if not form.is_valid():
@@ -108,7 +105,7 @@ def schedule_campaign(request, page: NewsletterPageMixin) -> None:
         messages.error(request, error.message)
         return
 
-    save_campaign(request, page)
+    save_campaign(request, page, message_user=False)
 
     try:
         backend.schedule_campaign(