✅(back) fix backend code related to multipage dev
During the multipage dev, the code base has changed a lot and rebase after rebase it has come difficult to manage fixup commits. This commits fix modification made that can be fixup in previous commits. The persmission AccessPermission has been renamed in ResourceWithAccessPermission and should be used in the DocumentAskForAccessViewSet. A migration with the same dependency exists, the last one is fixed. And a test didn't have removed an abilitites.
This commit is contained in:
committed by
Anthony LC
parent
304b3be273
commit
6af8d78ede
@@ -926,8 +926,7 @@ class DocumentViewSet(
|
||||
)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
with_accesses = serializer.validated_data.get("with_accesses", False)
|
||||
roles = set(document.get_roles(request.user))
|
||||
is_owner_or_admin = bool(roles.intersection(set(models.PRIVILEGED_ROLES)))
|
||||
is_owner_or_admin = document.get_role(request.user) in models.PRIVILEGED_ROLES
|
||||
|
||||
base64_yjs_content = document.content
|
||||
|
||||
@@ -1898,7 +1897,10 @@ class DocumentAskForAccessViewSet(
|
||||
|
||||
lookup_field = "id"
|
||||
pagination_class = Pagination
|
||||
permission_classes = [permissions.IsAuthenticated, permissions.AccessPermission]
|
||||
permission_classes = [
|
||||
permissions.IsAuthenticated,
|
||||
permissions.ResourceWithAccessPermission,
|
||||
]
|
||||
queryset = models.DocumentAskForAccess.objects.all()
|
||||
serializer_class = serializers.DocumentAskForAccessSerializer
|
||||
_document = None
|
||||
@@ -1921,8 +1923,9 @@ class DocumentAskForAccessViewSet(
|
||||
queryset = super().get_queryset()
|
||||
queryset = queryset.filter(document=document)
|
||||
|
||||
roles = set(document.get_roles(self.request.user))
|
||||
is_owner_or_admin = bool(roles.intersection(set(models.PRIVILEGED_ROLES)))
|
||||
is_owner_or_admin = (
|
||||
document.get_role(self.request.user) in models.PRIVILEGED_ROLES
|
||||
)
|
||||
if not is_owner_or_admin:
|
||||
queryset = queryset.filter(user=self.request.user)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user