Merge pull request #537 from bruecksen/536-bug-copy-newsletter-page-needs-to-set-sensible-defaults-for-campaign-values

Set propper default values on newsletterpage copy, show proper status…

Author: bruecksen

bakeup/newsletter/models.py

@@ -218,6 +218,24 @@ class NewsletterPage(NewsletterPageMixin):  # type: ignore
 
     newsletter_template = "newsletter/newsletter.html"
     template = "newsletter/newsletter.html"
+    newsletter_persistent_fields = [
+        "status",
+        "sent_date",
+    ]
+
+    def with_content_json(self, content):
+        obj = super().with_content_json(content)
+        for field in self.newsletter_persistent_fields:
+            setattr(obj, field, getattr(self, field))
+        return obj
+
+    def save_revision(self, *args, **kwargs):
+        revision = super().save_revision(*args, **kwargs)
+        self.save(
+            update_fields=self.newsletter_persistent_fields,
+            clean=False,
+        )
+        return revision
 
     def has_newsletter_permission(self, user, action):
         permission_policy = NewsletterPermissionPolicy(type(self))

bakeup/newsletter/wagtail_hooks.py

@@ -8,7 +8,21 @@
 from wagtail.models import Page
 
 from . import actions, views, viewsets
-from .models import NewsletterPageMixin
+from .models import CampaignStatus, NewsletterPageMixin
+
+
+@hooks.register("after_copy_page")  # type: ignore
+def clear_campaign_after_copy(request, page, new_page):
+    if isinstance(new_page, NewsletterPageMixin):
+        new_page = new_page.specific
+        new_page.status = CampaignStatus.UNSENT
+        new_page.sent_date = None
+        new_page.save(update_fields=["status", "sent_date"])
+        if new_page.locked:
+            new_page.locked = False
+            new_page.locked_at = None
+            new_page.locked_by = None
+            new_page.save(update_fields=["locked", "locked_at", "locked_by"])
 
 
 @hooks.register("register_admin_urls")  # type: ignore

bakeup/templates/newsletter/panels/newsletter_panel.html

@@ -22,26 +22,32 @@
             {% if report %}
                 {% if report.send_time %}
                     <p>
-                        <b>Send time:</b>
+                        <b>Versendet am:</b>
                         {{ report.send_time }}
                         ({{ report.send_time|timesince }} ago).
                     </p>
                 {% endif %}
 
                 <p>
-                    <b>Emails sent:</b>
+                    <b>Emails versendet:</b>
                     {{ report.emails_sent }}
                 </p>
 
             {% endif %}
         {% endblock %}
 
-    {% elif campaign.scheduled or campaign.sending %}
+    {% elif campaign.scheduled %}
         <p>
             <b>{{ campaign.get_status_display }}:</b>
             {{ campaign.newsletter_schedule_date }} (in {{ campaign.newsletter_schedule_date|timeuntil }}).
         </p>
 
+        {% elif campaign.sending %}
+        <p>
+            <b>{{ campaign.get_status_display|upper }}: </b>
+            Die Kampagne wird aktuell versendet, bitte warten!
+        </p>
+
     {% else %}
 
         <p>