mirror of https://github.com/jumpserver/jumpserver
feat: 资产添加admin_user_display
parent
ca6825008b
commit
a43d6ad34d
|
@ -33,7 +33,10 @@ class AssetViewSet(OrgBulkModelViewSet):
|
||||||
API endpoint that allows Asset to be viewed or edited.
|
API endpoint that allows Asset to be viewed or edited.
|
||||||
"""
|
"""
|
||||||
model = Asset
|
model = Asset
|
||||||
filter_fields = ("hostname", "ip", "systemuser__id", "admin_user__id", "platform__base")
|
filter_fields = (
|
||||||
|
"hostname", "ip", "systemuser__id", "admin_user__id", "platform__base",
|
||||||
|
"is_active"
|
||||||
|
)
|
||||||
search_fields = ("hostname", "ip")
|
search_fields = ("hostname", "ip")
|
||||||
ordering_fields = ("hostname", "ip", "port", "cpu_cores")
|
ordering_fields = ("hostname", "ip", "port", "cpu_cores")
|
||||||
serializer_classes = {
|
serializer_classes = {
|
||||||
|
|
|
@ -244,6 +244,10 @@ class Asset(ProtocolsMixin, NodesRelationMixin, OrgModelMixin):
|
||||||
def platform_base(self):
|
def platform_base(self):
|
||||||
return self.platform.base
|
return self.platform.base
|
||||||
|
|
||||||
|
@lazyproperty
|
||||||
|
def admin_user_display(self):
|
||||||
|
return self.admin_user.name
|
||||||
|
|
||||||
@lazyproperty
|
@lazyproperty
|
||||||
def admin_user_username(self):
|
def admin_user_username(self):
|
||||||
"""求可连接性时,直接用用户名去取,避免再查一次admin user
|
"""求可连接性时,直接用用户名去取,避免再查一次admin user
|
||||||
|
|
|
@ -82,7 +82,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
|
||||||
'created_by', 'date_created', 'hardware_info',
|
'created_by', 'date_created', 'hardware_info',
|
||||||
]
|
]
|
||||||
fields_fk = [
|
fields_fk = [
|
||||||
'admin_user', 'domain', 'platform'
|
'admin_user', 'admin_user_display', 'domain', 'platform'
|
||||||
]
|
]
|
||||||
fk_only_fields = {
|
fk_only_fields = {
|
||||||
'platform': ['name']
|
'platform': ['name']
|
||||||
|
|
Loading…
Reference in New Issue