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

Merge branch 'dev' into perm_tree

Browse Source
This commit is contained in:
ibuler
2018-06-01 15:41:50 +08:00
parent a9d1538135 54efc88799
commit e7c7c3a7a8
6 changed files with 48 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/assets/serializers/node.py
View File

@@ -9,7 +9,7 @@ from .asset import AssetGrantedSerializer
__all__ = [
'NodeSerializer', "NodeGrantedSerializer", "NodeAddChildrenSerializer",
"NodeAssetsSerializer", "NodeCurrentSerializer",
"NodeAssetsSerializer",
]
@@ -80,12 +80,6 @@ class NodeSerializer(serializers.ModelSerializer):
return fields
class NodeCurrentSerializer(NodeSerializer):
@staticmethod
def get_assets_amount(obj):
return obj.get_assets().count()
class NodeAssetsSerializer(serializers.ModelSerializer):
assets = serializers.PrimaryKeyRelatedField(many=True, queryset=Asset.objects.all())