github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 00:09:14 +00:00
Code Issues Projects Releases Wiki Activity

merge: with dev

Browse Source
This commit is contained in:
ibuler
2023-05-24 15:26:59 +08:00
parent 197364d42d 440cd13fcc
commit eccbf46300
106 changed files with 1935 additions and 1081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/api/asset/asset.py
View File

@@ -25,7 +25,7 @@ from ...notifications import BulkUpdatePlatformSkipAssetUserMsg
logger = get_logger(__file__)
__all__ = [
"AssetViewSet", "AssetTaskCreateApi",
"AssetsTaskCreateApi", 'AssetFilterSet'
"AssetsTaskCreateApi", 'AssetFilterSet',
]
@@ -95,7 +95,7 @@ class AssetViewSet(SuggestionMixin, NodeFilterMixin, OrgBulkModelViewSet):
"""
model = Asset
filterset_class = AssetFilterSet
search_fields = ("name", "address")
search_fields = ("name", "address", "comment")
ordering_fields = ('name', 'connectivity', 'platform', 'date_updated')
serializer_classes = (
("default", serializers.AssetSerializer),