Import ContextDecorator from contextlib

Will be removed on Django 3.0

orchestra/contrib/musician/templates/musician/dashboard.html

@@ -70,7 +70,7 @@
           <h4>{% trans "Mail" %}</h4>
           <p class="card-text"><i class="fas fa-envelope fa-3x"></i></p>
           <p class="card-text text-dark">
-            {{ domain.addresses|length }} {% trans "mail addresses created" %}
+            {{ domain.addresses.count }} {% trans "mail addresses created" %}
           </p>
           <a class="stretched-link" href="{% url 'musician:address-list' %}?domain={{ domain.id }}"></a>
       </div>

orchestra/contrib/musician/urls.py

@@ -31,12 +31,12 @@ urlpatterns = [
     path('address/new/', views.MailCreateView.as_view(), name='address-create'),
     path('address/<int:pk>/', views.MailUpdateView.as_view(), name='address-update'),
     path('address/<int:pk>/delete/', views.AddressDeleteView.as_view(), name='address-delete'),
-    path('mailboxes/', views.MailboxesView.as_view(), name='mailbox-list'),
+    path('mailboxes/', views.MailboxListView.as_view(), name='mailbox-list'),
     path('mailboxes/new/', views.MailboxCreateView.as_view(), name='mailbox-create'),
     path('mailboxes/<int:pk>/', views.MailboxUpdateView.as_view(), name='mailbox-update'),
     path('mailboxes/<int:pk>/delete/', views.MailboxDeleteView.as_view(), name='mailbox-delete'),
     path('mailboxes/<int:pk>/change-password/', views.MailboxChangePasswordView.as_view(), name='mailbox-password'),
     path('mailing-lists/', views.MailingListsView.as_view(), name='mailing-lists'),
     path('databases/', views.DatabasesView.as_view(), name='database-list'),
-    path('saas/', views.SaasView.as_view(), name='saas-list'),
+    path('saas/', views.SaasListView.as_view(), name='saas-list'),
 ]

orchestra/contrib/musician/views.py

@@ -340,7 +340,7 @@ class MailingListsView(ServiceListView):
         return {}
 
 
-class MailboxesView(ServiceListView):
+class MailboxListView(ServiceListView):
     service_class = MailboxService
     model = Mailbox
     template_name = "musician/mailboxes.html"
@@ -388,6 +388,9 @@ class MailboxUpdateView(CustomContextMixin, UserTokenRequiredMixin, UpdateView):
     success_url = reverse_lazy("musician:mailbox-list")
     extra_context = {'service': service_class}
 
+    def get_queryset(self):
+        return self.model.objects.filter(account=self.request.user)
+
 
 class MailboxDeleteView(CustomContextMixin, UserTokenRequiredMixin, DeleteView):
     model = Mailbox
@@ -422,6 +425,9 @@ class MailboxChangePasswordView(CustomContextMixin, UserTokenRequiredMixin, Upda
     form_class = MailboxChangePasswordForm
     success_url = reverse_lazy("musician:mailbox-list")
 
+    def get_queryset(self):
+        return self.model.objects.filter(account=self.request.user)
+
 
 class DatabasesView(ServiceListView):
     template_name = "musician/databases.html"
@@ -433,7 +439,7 @@ class DatabasesView(ServiceListView):
     }
 
 
-class SaasView(ServiceListView):
+class SaasListView(ServiceListView):
     service_class = SaasService
     model = SaaS
     template_name = "musician/saas.html"

orchestra/contrib/orchestration/managers.py

@@ -1,14 +1,14 @@
 import sys
+from contextlib import ContextDecorator
 from threading import local
 
 from django.contrib.admin.models import LogEntry
-from django.db.models.signals import pre_delete, post_save, m2m_changed
+from django.db.models.signals import m2m_changed, post_save, pre_delete
 from django.dispatch import receiver
-from django.utils.decorators import ContextDecorator
 
 from orchestra.utils.python import OrderedSet
 
-from . import manager, Operation, helpers
+from . import Operation, helpers, manager
 from .middlewares import OperationsMiddleware
 from .models import BackendLog, BackendOperation
 
@@ -37,7 +37,7 @@ def m2m_collector(sender, *args, **kwargs):
 class orchestrate(ContextDecorator):
     """
     Context manager for triggering backend operations out of request-response cycle, e.g. shell
-    
+
     with orchestrate():
         user = SystemUser.objects.get(username='rata')
         user.shell = '/dev/null'
@@ -46,7 +46,7 @@ class orchestrate(ContextDecorator):
     thread_locals = local()
     thread_locals.pending_operations = None
     thread_locals.route_cache = None
-    
+
     @classmethod
     def collect(cls, action, **kwargs):
         """ Collects all pending operations derived from model signals """
@@ -57,14 +57,14 @@ class orchestrate(ContextDecorator):
         kwargs['route_cache'] = cls.thread_locals.route_cache
         instance = kwargs.pop('instance')
         manager.collect(instance, action, **kwargs)
-    
+
     def __enter__(self):
         cls = type(self)
         self.old_pending_operations = cls.thread_locals.pending_operations
         cls.thread_locals.pending_operations = OrderedSet()
         self.old_route_cache = cls.thread_locals.route_cache
         cls.thread_locals.route_cache = {}
-    
+
     def __exit__(self, exc_type, exc_value, traceback):
         cls = type(self)
         if not exc_type: