github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2682 from jumpserver/dev 

Dev
pull/2684/head
老广 2019-05-10 11:31:28 +08:00 committed by GitHub
parent a025930957 497cba6b13
commit cbe919c4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,7 @@ class NodeChildrenAsTreeApi(generics.ListAPIView):
nodes_invalid = Node.objects.exclude(key__startswith=self.node.key) nodes_invalid = Node.objects.exclude(key__startswith=self.node.key)
queryset.extend(list(nodes_invalid)) queryset.extend(list(nodes_invalid))
queryset = [node.as_tree_node() for node in queryset] queryset = [node.as_tree_node() for node in queryset]
queryset = sorted(queryset)
return queryset return queryset
def filter_assets(self, queryset): def filter_assets(self, queryset):

12
apps/assets/models/node.py
View File

@ -44,7 +44,15 @@ class Node(OrgModelMixin):
return True return True
self_key = [int(k) for k in self.key.split(':')] self_key = [int(k) for k in self.key.split(':')]
other_key = [int(k) for k in other.key.split(':')] other_key = [int(k) for k in other.key.split(':')]
return self_key.__lt__(other_key) self_parent_key = self_key[:-1]
other_parent_key = other_key[:-1]
if self_parent_key == other_parent_key:
return self.name > other.name
if self_key != other_key:
return self_key > other_key
else:
return self.name > other.name
def __lt__(self, other): def __lt__(self, other):
return not self.__gt__(other) return not self.__gt__(other)
@ -305,5 +313,3 @@ class Node(OrgModelMixin):
for i in range(count): for i in range(count):
node = random.choice(cls.objects.all()) node = random.choice(cls.objects.all())
node.create_child('Node {}'.format(i)) node.create_child('Node {}'.format(i))