Merge branch 'master' into feature/performance-optimizations

aleksis/core/mixins.py

@@ -384,6 +384,7 @@ class AdvancedDeleteView(DeleteView):
         We recommend to include the mixin :class:`reversion.views.RevisionMixin`
         from `django-reversion` to enable soft-delete.
     """
+
     success_message: Optional[str] = None
 
     def delete(self, request, *args, **kwargs):

aleksis/core/util/core_helpers.py

@@ -15,9 +15,8 @@ from django.shortcuts import get_object_or_404
 from django.utils import timezone
 from django.utils.functional import lazy
 
-from django_global_request.middleware import get_request
-
 from cache_memoize import cache_memoize
+from django_global_request.middleware import get_request
 
 from aleksis.core.util import messages
 

aleksis/core/util/predicates.py

@@ -9,8 +9,9 @@ from guardian.shortcuts import get_objects_for_user
 from rules import predicate
 
 from ..models import Group
-from .core_helpers import get_site_preferences, queryset_rules_filter
+from .core_helpers import get_site_preferences
 from .core_helpers import has_person as has_person_helper
+from .core_helpers import queryset_rules_filter
 
 
 def permission_validator(request: HttpRequest, perm: str) -> bool:
@@ -65,13 +66,16 @@ def has_any_object(perm: str, klass):
     @predicate(name)
     def fn(user: User) -> bool:
         try:
-            ct_perm = ContentType.objects.get(app_label=perm.split('.', 1)[0], permission__codename=perm.split('.', 1)[1])
+            ct_perm = ContentType.objects.get(
+                app_label=perm.split(".", 1)[0], permission__codename=perm.split(".", 1)[1]
+            )
         except ContentType.DoesNotExist:
             ct_perm = None
         if ct_perm and ct_perm.model_class() == klass:
             return get_objects_for_user(user, perm, klass).exists()
         else:
             return queryset_rules_filter(user, klass.objects.all(), perm).exists()
+
     return fn
 
 

aleksis/core/views.py

@@ -377,7 +377,9 @@ class SystemStatus(MainView, PermissionRequiredMixin):
             if inspect().registered_tasks():
                 job_list = list(inspect().registered_tasks().values())[0]
                 for job in job_list:
-                    task_results.append(TaskResult.objects.filter(task_name=job).order_by("date_done").last())
+                    task_results.append(
+                        TaskResult.objects.filter(task_name=job).order_by("date_done").last()
+                    )
 
         context = {"plugins": self.plugins, "status_code": status_code, "tasks": task_results}
         return self.render_to_response(context, status=status_code)