[Update] Merge

This commit is contained in:
ibuler
2018-05-25 17:28:53 +08:00
parent a96bda8ca9
commit 3f4b5ad465
2 changed files with 32 additions and 19 deletions

View File

@@ -41,7 +41,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
asset = get_object_or_404(Asset, pk=asset_id)
permissions = set(queryset.filter(assets=asset))
for node in asset.nodes.all():
inherit_nodes.update(set(node.ancestor_with_node))
inherit_nodes.update(set(node.ancestor_with_self))
elif node_id:
node = get_object_or_404(Node, pk=node_id)
permissions = set(queryset.filter(nodes=node))