paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-19 10:19:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Actually this way may be cleaner

Browse Source
This commit is contained in:
shamoon 2025-03-13 22:25:35 -07:00
parent 2f02142651
commit b273af130f
2 changed files with 67 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/documents/permissions.py
View File

@ -70,6 +70,7 @@ def set_permissions_for_object(permissions: list[str], object, *, merge: bool =
for action in permissions: for action in permissions:
permission = f"{action}_{object.__class__.__name__.lower()}" permission = f"{action}_{object.__class__.__name__.lower()}"
if "users" in permissions[action]:
# users # users
users_to_add = User.objects.filter(id__in=permissions[action]["users"]) users_to_add = User.objects.filter(id__in=permissions[action]["users"])
users_to_remove = ( users_to_remove = (
@ -96,6 +97,7 @@ def set_permissions_for_object(permissions: list[str], object, *, merge: bool =
user, user,
object, object,
) )
if "groups" in permissions[action]:
# groups # groups
groups_to_add = Group.objects.filter(id__in=permissions[action]["groups"]) groups_to_add = Group.objects.filter(id__in=permissions[action]["groups"])
groups_to_remove = ( groups_to_remove = (

26
src/documents/serialisers.py
View File

@ -160,24 +160,24 @@ class SetPermissionsMixin:
def validate_set_permissions(self, set_permissions=None): def validate_set_permissions(self, set_permissions=None):
permissions_dict = { permissions_dict = {
"view": { "view": {},
"users": User.objects.none(), "change": {},
"groups": Group.objects.none(),
},
"change": {
"users": User.objects.none(),
"groups": Group.objects.none(),
},
} }
if set_permissions is not None: if set_permissions is not None:
for action, _ in permissions_dict.items(): for action in ["view", "change"]:
if action in set_permissions: if action in set_permissions:
if "users" in set_permissions[action]:
users = set_permissions[action]["users"] users = set_permissions[action]["users"]
permissions_dict[action]["users"] = self._validate_user_ids(users) permissions_dict[action]["users"] = self._validate_user_ids(
users,
)
if "groups" in set_permissions[action]:
groups = set_permissions[action]["groups"] groups = set_permissions[action]["groups"]
permissions_dict[action]["groups"] = self._validate_group_ids( permissions_dict[action]["groups"] = self._validate_group_ids(
groups, groups,
) )
else:
del permissions_dict[action]
return permissions_dict return permissions_dict
def _set_permissions(self, permissions, object): def _set_permissions(self, permissions, object):
@ -226,11 +226,7 @@ class SerializerWithPerms(serializers.Serializer):
}, },
) )
class SetPermissionsSerializer(serializers.DictField): class SetPermissionsSerializer(serializers.DictField):
def validate_empty_values(self, data: dict | None): pass
if data is fields.empty or (data is not None and len(data) == 0):
# allow empty but skip the field to prevent overwriting permissions
raise fields.SkipField
return super().validate_empty_values(data)
class OwnedObjectSerializer( class OwnedObjectSerializer(