Merge remote-tracking branch 'origin' into development

This commit is contained in:
2025-12-01 11:36:34 +03:30

View File

@@ -86,18 +86,18 @@ class UpdatePageAccessViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSe
permissions_to_delete = Permissions.objects.exclude(name__in=dev_perms_name)
permissions_to_delete.delete()
for perm in dev_data['permissions']:
permission_obj, _ = Permissions.objects.update_or_create(
id=perm['id'], # keep dev permission ids in prod
defaults={
'name': perm['name'],
'description': perm['description'],
'category': perm['category'],
'page_id': page_map[perm['page']],
'is_active': perm['is_active'],
'modify_state': perm['modify_state'],
}
)
for item in dev_data:
for perm in item['permissions']:
permission_obj, _ = Permissions.objects.update_or_create(
name=perm['name'], # keep dev permission ids in prod
page_id=page_map[perm['page']],
defaults={
'description': perm['description'],
'category': perm['category'],
'is_active': perm['is_active'],
'modify_state': perm['modify_state'],
}
)
return Response(dev_data)