From 2e3aacc67a1deeced7b3222d0eec67030654b4f1 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Sat, 8 Nov 2025 10:32:35 +0330 Subject: [PATCH] fix permissions serializer on role --- apps/authorization/api/v1/serializers.py | 1 + apps/product/services/services.py | 4 ++++ apps/warehouse/web/api/v1/api.py | 1 + 3 files changed, 6 insertions(+) diff --git a/apps/authorization/api/v1/serializers.py b/apps/authorization/api/v1/serializers.py index ee1dd23..24df352 100644 --- a/apps/authorization/api/v1/serializers.py +++ b/apps/authorization/api/v1/serializers.py @@ -106,6 +106,7 @@ class RoleSerializer(serializers.ModelSerializer): """ representation = super().to_representation(instance) representation['type'] = auth_serializer.OrganizationTypeSerializer(instance.type).data + representation['permissions'] = PermissionSerializer(instance.permissions, many=True) if instance.parent_role: representation['parent_role'] = {'name': instance.parent_role.role_name, 'id': instance.parent_role.id} return representation diff --git a/apps/product/services/services.py b/apps/product/services/services.py index 68a01af..b0cb9fb 100644 --- a/apps/product/services/services.py +++ b/apps/product/services/services.py @@ -36,6 +36,7 @@ def quota_live_stock_allocation_info(quota: Quota) -> typing.Any: } for alloc in allocations] return allocations_list + return None def quota_incentive_plans_info(quota: Quota, rancher: Rancher) -> typing.Any: @@ -63,6 +64,7 @@ def quota_incentive_plans_info(quota: Quota, rancher: Rancher) -> typing.Any: incentive_plans_list.append(incentive_plans_data) return incentive_plans_list + return None def quota_brokers_value(quota: Quota) -> typing.Any: @@ -77,6 +79,7 @@ def quota_brokers_value(quota: Quota) -> typing.Any: } for broker in brokers] return broker_values_list + return None def quota_attribute_value(quota: Quota) -> typing.Any: @@ -91,6 +94,7 @@ def quota_attribute_value(quota: Quota) -> typing.Any: } for attr in attributes] return attribute_values_list + return None def quota_pricing_items_by_type(quota: Quota, sharing: list) -> typing.Any: diff --git a/apps/warehouse/web/api/v1/api.py b/apps/warehouse/web/api/v1/api.py index b423900..301ee2d 100644 --- a/apps/warehouse/web/api/v1/api.py +++ b/apps/warehouse/web/api/v1/api.py @@ -131,6 +131,7 @@ class InventoryEntryViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, class InventoryQuotaSaleTransactionViewSet(SoftDeleteMixin, DynamicSearchMixin, BaseViewSet, viewsets.ModelViewSet): queryset = warehouse_models.InventoryQuotaSaleTransaction.objects.all() serializer_class = warehouse_serializers.InventoryQuotaSaleTransactionSerializer + filter_backends = [filters.SearchFilter] search_fields = [ 'rancher_fullname', 'rancher_mobile', 'pos_device__device_identity', 'pos_device__acceptor', 'pos_device__terminal', 'pos_device__serial',