Allow to send/discard filtered outbox list

doc/changelog.rst

@@ -3,6 +3,7 @@
 Release Notes
 =============
 
+- :feature:`orga` You can now send or discard only a filtered list of emails from the outbox.
 - :feature:`dev,1596` With the new ``queuedmail_pre_send`` signal, your plugin can modify a `QueuedMail` object before it is sent out. You can handle the sending entirely by setting the object’s `sent` attribute, or e.g. modify the email text before it is sent out by pretalx.
 - :feature:`orga` Outgoing mails now know which proposals or sessions they are about. This information can’t be added to existing mails, but will be included in all new mails, which will link to the proposals in question, and will help you find relevant emails by showing the linked proposals and their track colours (if any).
 - :feature:`orga:schedule` When exporting your sessions or submissions as CSV or JSON, you can now choose to export start and end times as separate date/time values instead of a single combined value.

src/pretalx/orga/templates/orga/mails/outbox_list.html

@@ -14,22 +14,32 @@ <h2>
         </span>
     </h2>
     <div class="submit-group">
-        <span>
+        <div>
             {% include "common/includes/search_form.html" with omit_wrapper=True %}
-        </span>
-        <span>
-            {% if is_paginated and page_obj.paginator.num_pages > 1 %}
-                <a href="{{ request.event.orga_urls.send_outbox }}?pks={% for mail in mails %}{{ mail.pk }}{% if not forloop.last %},{% endif %}{% endfor %}">
-                    <button class="btn btn-outline-success">{% translate "Send all on this page" %}</button>
+        </div>
+        <div class="d-flex flex-column align-items-end">
+            <div>
+                {% if is_paginated and page_obj.paginator.num_pages > 1 %}
+                    <a href="{{ request.event.orga_urls.send_outbox }}?pks={% for mail in mails %}{{ mail.pk }}{% if not forloop.last %},{% endif %}{% endfor %}">
+                        <button class="btn btn-outline-success">{% translate "Send all on this page" %}</button>
+                    </a>
+                {% endif %}
+                <a href="{{ request.event.orga_urls.send_outbox }}?{{ request.GET.urlencode }}" class="btn btn-success">
+                    {% translate "Send all" %}
                 </a>
-            {% endif %}
-            <a href="{{ request.event.orga_urls.send_outbox }}">
-                <button class="btn btn-success">{% translate "Send all" %}</button>
-            </a>
-            <a href="{{ request.event.orga_urls.purge_outbox }}">
-                <button class="btn btn-danger">{% translate "Discard all" %}</button>
-            </a>
-        </span>
+                <a href="{{ request.event.orga_urls.purge_outbox }}?{{ request.GET.urlencode }}" class="btn btn-danger">
+                    {% translate "Discard all" %}
+                </a>
+            </div>
+            <div>
+                {% if is_filtered %}
+                    <div class="text-right text-muted mt-2">
+                        <i class="fa fa-filter"></i>
+                        {% translate "The current filters will be used when sending/discarding emails." %}
+                    </div>
+                {% endif %}
+            </div>
+        </div>
     </div>
     <div class="table-responsive-sm">
         <table class="table table-sm table-hover table-flip table-sticky">

src/pretalx/orga/views/mails.py

@@ -65,6 +65,14 @@ def get_queryset(self):
     def show_tracks(self):
         return self.request.event.get_feature_flag("use_tracks")
 
+    @context
+    @cached_property
+    def is_filtered(self):
+        return (
+            self.get_queryset().count()
+            != self.request.event.queued_mails.filter(sent__isnull=True).count()
+        )
+
 
 class SentMail(
     EventPermissionRequired, Sortable, Filterable, PaginationMixin, ListView
@@ -100,7 +108,7 @@ def show_tracks(self):
         return self.request.event.get_feature_flag("use_tracks")
 
 
-class OutboxSend(EventPermissionRequired, ActionConfirmMixin, TemplateView):
+class OutboxSend(ActionConfirmMixin, OutboxList):
     permission_required = "orga.send_mails"
     action_object_name = ""
     action_confirm_label = phrases.base.send
@@ -145,12 +153,12 @@ def dispatch(self, request, *args, **kwargs):
 
     @cached_property
     def queryset(self):
-        qs = self.request.event.queued_mails.filter(sent__isnull=True)
         pks = self.request.GET.get("pks") or ""
         if pks:
-            pks = pks.split(",")
-            qs = qs.filter(pk__in=pks)
-        return qs
+            return self.request.event.queued_mails.filter(sent__isnull=True).filter(
+                pk__in=pks.split(",")
+            )
+        return self.get_queryset()
 
     def post(self, request, *args, **kwargs):
         mails = self.queryset
@@ -228,13 +236,10 @@ def post(self, request, *args, **kwargs):
         return redirect(request.event.orga_urls.outbox)
 
 
-class OutboxPurge(PermissionRequired, ActionConfirmMixin, TemplateView):
+class OutboxPurge(ActionConfirmMixin, OutboxList):
     permission_required = "orga.purge_mails"
     action_object_name = ""
 
-    def get_permission_object(self):
-        return self.request.event
-
     @context
     def question(self):
         return _("Do you really want to purge {count} mails?").format(
@@ -250,7 +255,7 @@ def action_back_url(self):
 
     @cached_property
     def queryset(self):
-        return self.request.event.queued_mails.filter(sent__isnull=True)
+        return self.get_queryset()
 
     def post(self, request, *args, **kwargs):
         qs = self.queryset

src/pretalx/static/orga/css/_layout.css

@@ -551,6 +551,12 @@ footer {
     }
   }
 }
+.submit-group form {
+  .form-group,
+  button {
+    margin-bottom: 0;
+  }
+}
 
 .dashboard-history {
   max-height: none;