github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-28 08:06:27 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 和资产相关的Serializer添加protocols字段； (#2800)

Browse Source 
* [Bugfix] 和资产相关的Serializer添加protocols字段；

* [Bugfix] RemoteApp Form 修改过滤RDP协议资产

* [Bugfix] 修改小问题
This commit is contained in:
BaiJiangJie
2019-06-17 16:46:01 +08:00
committed by GitHub
parent 7715e62def
commit 795807ddbe
4 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apps/assets/serializers/asset.py
View File

@@ -12,8 +12,8 @@ from ..models import Asset, Protocol
from .system_user import AssetSystemUserSerializer
__all__ = [
'AssetSerializer', 'AssetGrantedSerializer', 'MyAssetGrantedSerializer',
'AssetAsNodeSerializer', 'AssetSimpleSerializer',
'AssetSerializer', 'AssetGrantedSerializer', 'AssetSimpleSerializer',
'ProtocolSerializer',
]
@@ -115,16 +115,19 @@ class AssetSerializer(BulkSerializerMixin, OrgResourceSerializerMixin,
return instance
class AssetAsNodeSerializer(serializers.ModelSerializer):
class Meta:
model = Asset
fields = ['id', 'hostname', 'ip', 'platform', 'protocols']
# class AssetAsNodeSerializer(serializers.ModelSerializer):
# protocols = ProtocolSerializer(many=True)
#
# class Meta:
# model = Asset
# fields = ['id', 'hostname', 'ip', 'platform', 'protocols']
class AssetGrantedSerializer(serializers.ModelSerializer):
"""
被授权资产的数据结构
"""
protocols = ProtocolSerializer(many=True)
system_users_granted = AssetSystemUserSerializer(many=True, read_only=True)
system_users_join = serializers.SerializerMethodField()
# nodes = NodeTMPSerializer(many=True, read_only=True)
@@ -132,9 +135,9 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
class Meta:
model = Asset
fields = (
"id", "hostname", "ip", "system_users_granted",
"id", "hostname", "ip", "protocols", "system_users_granted",
"is_active", "system_users_join", "os", 'domain',
"platform", "comment", "protocols", "org_id", "org_name",
"platform", "comment", "org_id", "org_name",
)
@staticmethod
@@ -143,21 +146,24 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
return ', '.join(system_users)
class MyAssetGrantedSerializer(AssetGrantedSerializer):
"""
普通用户获取授权的资产定义的数据结构
"""
class Meta:
model = Asset
fields = (
"id", "hostname", "system_users_granted",
"is_active", "system_users_join", "org_name",
"os", "platform", "comment", "org_id", "protocol"
)
# class MyAssetGrantedSerializer(AssetGrantedSerializer):
# """
# 普通用户获取授权的资产定义的数据结构
# """
# protocols = ProtocolSerializer(many=True)
#
# class Meta:
# model = Asset
# fields = (
# "id", "hostname", "system_users_granted",
# "is_active", "system_users_join", "org_name",
# "os", "platform", "comment", "org_id", "protocols"
# )
class AssetSimpleSerializer(serializers.ModelSerializer):
protocols = ProtocolSerializer(many=True)
class Meta:
model = Asset
fields = ['id', 'hostname', 'port', 'ip', 'connectivity']
fields = ['id', 'hostname', 'ip', 'protocols', 'connectivity', 'port']