From 5103dab72e5351ce7e607522ae7859fe7d653f50 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 26 Apr 2018 20:48:32 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E8=A7=A3=E5=86=B3=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/node.py | 8 ++++---- apps/assets/serializers/asset.py | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index 39390447c..cc940757f 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -108,18 +108,18 @@ class NodeChildrenApi(mixins.ListModelMixin, generics.CreateAPIView): return node def get_queryset(self): - queryset = set() + queryset = [] query_all = self.request.query_params.get("all") query_assets = self.request.query_params.get('assets') node = self.get_object() if node == Node.root(): - queryset.add(node) + queryset.append(node) if query_all: children = node.get_all_children() else: children = node.get_children() - queryset.update(set(children)) + queryset.extend(list(children)) if query_assets: assets = node.get_assets() for asset in assets: @@ -128,7 +128,7 @@ class NodeChildrenApi(mixins.ListModelMixin, generics.CreateAPIView): node_fake.parent = node node_fake.value = asset.hostname node_fake.is_node = False - queryset.add(node_fake) + queryset.append(node_fake) queryset = sorted(queryset, key=lambda x: x.is_node, reverse=True) return queryset diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py index 8556be3bf..cf844b5c7 100644 --- a/apps/assets/serializers/asset.py +++ b/apps/assets/serializers/asset.py @@ -18,8 +18,7 @@ class NodeTMPSerializer(serializers.ModelSerializer): class Meta: model = Node - fields = ['id', 'key', 'value', 'parent', 'assets_amount', - 'is_asset'] + fields = ['id', 'key', 'value', 'parent', 'assets_amount', 'is_node'] list_serializer_class = BulkListSerializer @staticmethod