diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py index fb86dad40..4de9fb899 100644 --- a/apps/assets/api/asset.py +++ b/apps/assets/api/asset.py @@ -32,10 +32,15 @@ class AssetViewSet(FilterAssetByNodeMixin, OrgBulkModelViewSet): API endpoint that allows Asset to be viewed or edited. """ model = Asset - filterset_fields = ( - "hostname", "ip", "systemuser__id", "admin_user__id", "platform__base", - "is_active" - ) + filterset_fields = { + 'hostname': ['exact'], + 'ip': ['exact'], + 'systemuser__id': ['exact'], + 'admin_user__id': ['exact'], + 'platform__base': ['exact'], + 'is_active': ['exact'], + 'protocols': ['exact', 'icontains'] + } search_fields = ("hostname", "ip") ordering_fields = ("hostname", "ip", "port", "cpu_cores") serializer_classes = { diff --git a/apps/assets/api/system_user.py b/apps/assets/api/system_user.py index e799073d8..af7590579 100644 --- a/apps/assets/api/system_user.py +++ b/apps/assets/api/system_user.py @@ -29,7 +29,11 @@ class SystemUserViewSet(OrgBulkModelViewSet): System user api set, for add,delete,update,list,retrieve resource """ model = SystemUser - filterset_fields = ("name", "username", "protocol") + filterset_fields = { + 'name': ['exact'], + 'username': ['exact'], + 'protocol': ['exact', 'in'] + } search_fields = filterset_fields serializer_class = serializers.SystemUserSerializer serializer_classes = { diff --git a/apps/users/api/user.py b/apps/users/api/user.py index 672c90e88..1ac03af5e 100644 --- a/apps/users/api/user.py +++ b/apps/users/api/user.py @@ -32,10 +32,7 @@ __all__ = [ class UserViewSet(CommonApiMixin, UserQuerysetMixin, BulkModelViewSet): - filterset_fields = { - 'name': ['exact', 'in'] - } - # filterset_fields = ('username', 'email', 'name', 'id', 'source') + filterset_fields = ('username', 'email', 'name', 'id', 'source') search_fields = filterset_fields permission_classes = (IsOrgAdmin, CanUpdateDeleteUser) serializer_classes = {