Merge SystemLabelView into MsgListView

Author: rowanseymour

temba/ivr/views.py

@@ -1,6 +1,7 @@
 from smartmin.views import SmartCRUDL
 
 from django.utils.translation import gettext_lazy as _
+
 from temba.orgs.views.base import BaseListView
 from temba.utils.views.mixins import SpaMixin
 

temba/msgs/views.py

@@ -47,11 +47,17 @@
 from .models import Broadcast, Label, LabelCount, Media, MessageExport, Msg, OptIn, SystemLabel
 
 
-class SystemLabelView(SpaMixin, BaseListView):
+class MsgListView(ContextMenuMixin, BulkActionMixin, SpaMixin, BaseListView):
     """
-    Base class for views backed by a system label or message label queryset
+    Base class for message list views with message folders and labels listed by the side
     """
 
+    permission = "msgs.msg_list"
+    search_fields = ("text__icontains", "contact__name__icontains", "contact__urns__path__icontains")
+    default_order = ("-created_on", "-id")
+    allow_export = False
+    bulk_actions = ()
+    bulk_action_permissions = {"resend": "msgs.msg_create", "delete": "msgs.msg_update"}
     system_label = None
     paginate_by = 100
 
@@ -62,38 +68,6 @@ def pre_process(self, request, *args, **kwargs):
     def derive_label(self):
         return self.system_label
 
-    def get_context_data(self, **kwargs):
-        org = self.request.org
-        counts = SystemLabel.get_counts(org)
-        label = self.derive_label()
-
-        # if there isn't a search filtering the queryset, we can replace the count function with a pre-calculated value
-        if "search" not in self.request.GET:
-            if isinstance(label, Label):
-                patch_queryset_count(self.object_list, label.get_visible_count)
-            elif isinstance(label, str):
-                patch_queryset_count(self.object_list, lambda: counts[label])
-
-        context = super().get_context_data(**kwargs)
-        context["has_messages"] = (
-            any(counts.values()) or Archive.objects.filter(org=org, archive_type=Archive.TYPE_MSG).exists()
-        )
-
-        return context
-
-
-class MsgListView(ContextMenuMixin, BulkActionMixin, SystemLabelView):
-    """
-    Base class for message list views with message folders and labels listed by the side
-    """
-
-    permission = "msgs.msg_list"
-    search_fields = ("text__icontains", "contact__name__icontains", "contact__urns__path__icontains")
-    default_order = ("-created_on", "-id")
-    allow_export = False
-    bulk_actions = ()
-    bulk_action_permissions = {"resend": "msgs.msg_create", "delete": "msgs.msg_update"}
-
     def derive_export_url(self):
         redirect = quote_plus(self.request.get_full_path())
         label = self.derive_label()
@@ -114,6 +88,25 @@ def get_queryset(self, **kwargs):
 
         return qs
 
+    def get_context_data(self, **kwargs):
+        org = self.request.org
+        counts = SystemLabel.get_counts(org)
+        label = self.derive_label()
+
+        # if there isn't a search filtering the queryset, we can replace the count function with a pre-calculated value
+        if "search" not in self.request.GET:
+            if isinstance(label, Label):
+                patch_queryset_count(self.object_list, label.get_visible_count)
+            elif isinstance(label, str):
+                patch_queryset_count(self.object_list, lambda: counts[label])
+
+        context = super().get_context_data(**kwargs)
+        context["has_messages"] = (
+            any(counts.values()) or Archive.objects.filter(org=org, archive_type=Archive.TYPE_MSG).exists()
+        )
+
+        return context
+
     def get_bulk_action_labels(self):
         return self.request.org.msgs_labels.filter(is_active=True).order_by(Lower("name"))