fix role & role pernissions for user

This commit is contained in:
2025-08-07 13:16:10 +03:30
parent fe6417b1c3
commit bc8c884678
2 changed files with 21 additions and 21 deletions

View File

@@ -139,17 +139,17 @@ class UserRelationSerializer(serializers.ModelSerializer):
# set permissions by a default structure like:
# 'page permission':[element permissions]
permissions = instance.permissions.filter(is_active=True)
representation['permissions'] = PermissionSerializer().permissions_structure_output(permissions)
representation['permissions'] = (
PermissionSerializer().permissions_structure_output(permissions) +
PermissionSerializer().permissions_structure_output(instance.role.permissions.all())
)
return representation
def update(self, instance, validated_data):
""" update user relation object """
# if role of user changed, clear all permissions and set new role permissions for user
if not instance.role == validated_data.get('role', instance.role):
instance.role = validated_data.get('role', instance.role)
instance.permissions.clear()
instance.permissions.add(*instance.role.permissions.all())
instance.role = validated_data.get('role', instance.role)
instance.organization = validated_data.get('organization', instance.organization)
instance.save()