From e91188ce1253ba304c7fb89a808800cd648add0f Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Wed, 17 Sep 2025 15:08:43 +0500 Subject: [PATCH] fix --- core/apps/accounts/serializers/permission.py | 8 ++------ core/apps/accounts/views/user.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/core/apps/accounts/serializers/permission.py b/core/apps/accounts/serializers/permission.py index 684a93e..903548c 100644 --- a/core/apps/accounts/serializers/permission.py +++ b/core/apps/accounts/serializers/permission.py @@ -12,20 +12,16 @@ class PermissionToActionListSerializer(serializers.ModelSerializer): class PermissionToTabListSerializer(serializers.ModelSerializer): - permission_to_actions = PermissionToActionListSerializer(many=True) - class Meta: model = PermissionToTab fields = [ - 'id', 'name', 'code', 'permission_to_actions' + 'id', 'name', 'code' ] class PermissionListSerializer(serializers.ModelSerializer): - permission_tab = PermissionToTabListSerializer(many=True) - class Meta: model = Permission fields = [ - 'id', 'name', 'code', 'permission_tab' + 'id', 'name', 'code' ] \ No newline at end of file diff --git a/core/apps/accounts/views/user.py b/core/apps/accounts/views/user.py index 5bc76f2..86de917 100644 --- a/core/apps/accounts/views/user.py +++ b/core/apps/accounts/views/user.py @@ -8,7 +8,7 @@ from core.apps.accounts.serializers import user as serializers from core.apps.accounts.permissions.permissions import HasRolePermission from core.apps.accounts.utils.permission import get_permissions_with_tabs from core.apps.shared.paginations.custom import CustomPageNumberPagination -from core.apps.accounts.serializers.permission import PermissionListSerializer +from core.apps.accounts.serializers.permission import PermissionListSerializer, PermissionToTabListSerializer, PermissionToActionListSerializer from core.apps.accounts.models.permission import Permission @@ -106,8 +106,15 @@ class UserPermissionListApiView(generics.GenericAPIView): return Response({'success': False, 'message': 'User has no role assigned'}, status=400) serializer = self.serializer_class(user.role.permissions, many=True) + tab_permissions = PermissionToTabListSerializer(user.role.permission_to_tabs, many=True) + action_permissions = PermissionToActionListSerializer(user.role.permission_to_actions, many=True) return Response( - {'success': True, 'permissions': serializer.data}, + { + 'success': True, + 'permissions': serializer.data, + 'tab_permissions': tab_permissions.data, + 'action_permissions': action_permissions.data + }, status=200 )