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

Merge pull request #2583 from jumpserver/dev 

Dev
pull/2608/head
老广 2019-04-04 12:33:16 +08:00 committed by GitHub
parent fc167526ae 638ba31694
commit 76b3cd8edd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/asset.py
View File

@ -153,7 +153,7 @@ class Asset(OrgModelMixin):
nodes = [] nodes = []
for node in self.get_nodes(): for node in self.get_nodes():
_nodes = node.get_ancestor(with_self=True) _nodes = node.get_ancestor(with_self=True)
_nodes.append(_nodes) nodes.append(_nodes)
if flat: if flat:
nodes = list(reduce(lambda x, y: set(x) | set(y), nodes)) nodes = list(reduce(lambda x, y: set(x) | set(y), nodes))
return nodes return nodes