diff --git a/hb_server/apps/system/views.py b/hb_server/apps/system/views.py index 3664054..06de18c 100644 --- a/hb_server/apps/system/views.py +++ b/hb_server/apps/system/views.py @@ -200,9 +200,9 @@ class PermissionViewSet(ModelViewSet): queryset = Permission.objects.all() serializer_class = PermissionSerializer pagination_class = None - search_fields = ['name'] + search_fields = ['name', 'method'] ordering_fields = ['sort'] - ordering = ['pk'] + ordering = ['sort'] class OrganizationViewSet(ModelViewSet): diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 8d77fed..c27f599 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -163,7 +163,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet): 'to_order').prefetch_related('wp_child') serializer_class = WProductListSerializer filterset_class = WProductFilterSet - search_fields = ['number'] + search_fields = ['number', 'material__name', 'subproduction_plan__number'] ordering_fields = ['id'] ordering = ['id']