Skip to content

Commit 2c35e34

Browse files
lunikaPanchoutNathan
authored andcommitted
✅(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.
1 parent 5b9fb02 commit 2c35e34

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/backend/core/api/viewsets.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,10 @@ class DocumentAskForAccessViewSet(
18191819

18201820
lookup_field = "id"
18211821
pagination_class = Pagination
1822-
permission_classes = [permissions.IsAuthenticated, permissions.AccessPermission]
1822+
permission_classes = [
1823+
permissions.IsAuthenticated,
1824+
permissions.ResourceWithAccessPermission,
1825+
]
18231826
queryset = models.DocumentAskForAccess.objects.all()
18241827
serializer_class = serializers.DocumentAskForAccessSerializer
18251828
_document = None
@@ -1842,8 +1845,9 @@ def get_queryset(self):
18421845
queryset = super().get_queryset()
18431846
queryset = queryset.filter(document=document)
18441847

1845-
roles = set(document.get_roles(self.request.user))
1846-
is_owner_or_admin = bool(roles.intersection(set(models.PRIVILEGED_ROLES)))
1848+
is_owner_or_admin = (
1849+
document.get_role(self.request.user) in models.PRIVILEGED_ROLES
1850+
)
18471851
if not is_owner_or_admin:
18481852
queryset = queryset.filter(user=self.request.user)
18491853

src/backend/core/migrations/0022_remove_document_is_public_and_more.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class Migration(migrations.Migration):
77
dependencies = [
8-
("core", "0021_activate_unaccent_extension"),
8+
("core", "0022_alter_user_language_documentaskforaccess"),
99
]
1010

1111
operations = [

src/backend/core/tests/documents/test_api_documents_trashbin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ def test_api_documents_trashbin_format():
7474
"accesses_view": True,
7575
"ai_transform": True,
7676
"ai_translate": True,
77-
"ancestors_links_definitions": {},
7877
"attachment_upload": True,
7978
"children_create": True,
8079
"children_list": True,

0 commit comments

Comments
 (0)