Merge branch 'master' into 'devalidation_reason'

# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po

apps/permission/admin.py

@@ -28,4 +28,3 @@ class RolePermissionsAdmin(admin.ModelAdmin):
     Admin customisation for RolePermissions
     """
     list_display = ('role', )
-

apps/permission/api/views.py

@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django_filters.rest_framework import DjangoFilterBackend
-
 from api.viewsets import ReadOnlyProtectedModelViewSet
+
 from .serializers import PermissionSerializer
 from ..models import Permission
 

apps/permission/models.py

@@ -10,7 +10,6 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import F, Q, Model
 from django.utils.translation import gettext_lazy as _
-
 from member.models import Role
 
 
@@ -281,4 +280,3 @@ class RolePermissions(models.Model):
 
     def __str__(self):
         return str(self.role)
-

apps/permission/permissions.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework.permissions import DjangoObjectPermissions
+
 from .backends import PermissionBackend
 
 SAFE_METHODS = ('HEAD', 'OPTIONS', )

apps/permission/signals.py

@@ -3,10 +3,9 @@
 
 from django.core.exceptions import PermissionDenied
 from django.db.models.signals import pre_save, pre_delete, post_save, post_delete
-
 from logs import signals as logs_signals
-from permission.backends import PermissionBackend
 from note_kfet.middlewares import get_current_authenticated_user
+from permission.backends import PermissionBackend
 
 
 EXCLUDED = [

apps/permission/templatetags/perms.py

@@ -3,10 +3,8 @@
 
 from django.contrib.contenttypes.models import ContentType
 from django.template.defaultfilters import stringfilter
-
-from note_kfet.middlewares import get_current_authenticated_user, get_current_session
 from django import template
-
+from note_kfet.middlewares import get_current_authenticated_user, get_current_session
 from permission.backends import PermissionBackend