github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-04 23:24:19 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 修复资产数量不对的bug

Browse Source
This commit is contained in:
ibuler
2018-08-10 14:46:04 +08:00
parent 7da46354ca
commit 6b86b8b485
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,10 +43,6 @@ class NodeViewSet(viewsets.ModelViewSet):
permission_classes = (IsOrgAdmin,)
serializer_class = serializers.NodeSerializer
def get_queryset(self):
queryset = super().get_queryset().annotate(Count('assets'))
return queryset
def perform_create(self, serializer):
child_key = Node.root().get_next_child_key()
serializer.validated_data["key"] = child_key
@@ -108,9 +104,9 @@ class NodeChildrenApi(mixins.ListModelMixin, generics.CreateAPIView):
queryset.append(node)
if query_all:
children = node.get_all_children().annotate(Count("assets"))
children = node.get_all_children()
else:
children = node.get_children().annotate(Count("assets"))
children = node.get_children()
queryset.extend(list(children))
if query_assets: