Merge pull request #3497 from jumpserver/dev

Dev

Merge pull request #3497 from jumpserver/dev
Dev
4493a824 · BaiJiangJie · GitHub · 560de55c · 07875197 · 4493a824
Unverified Commit 4493a824 authored Dec 04, 2019 by BaiJiangJie Committed by GitHub Dec 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

domain.py apps/assets/api/domain.py +2 -2

No files found.
--- a/apps/assets/api/domain.py
+++ b/apps/assets/api/domain.py
@@ -29,8 +29,8 @@ class DomainViewSet(OrgBulkModelViewSet):

 class GatewayViewSet(OrgBulkModelViewSet):
    model = Gateway
-    filter_fields = ("domain__name", "name", "username", "ip", "domain__id")
-    search_fields = filter_fields
+    filter_fields = ("domain__name", "name", "username", "ip", "domain")
+    search_fields = ("domain__name", "name", "username", "ip")
    permission_classes = (IsOrgAdmin,)
    serializer_class = serializers.GatewaySerializer