Merge remote-tracking branch 'origin/bugfix' into bugfix

2019-07-01 20:02:17 +08:00 · 2019-07-01 20:02:17 +08:00 · 7f7853dbc9
parent 4d3856975b 8905c27b86
commit 7f7853dbc9
1 changed files with 1 additions and 1 deletions
--- a/apps/perms/utils/asset_permission.py
+++ b/apps/perms/utils/asset_permission.py
@ -101,7 +101,7 @@ class GenerateTree:
            return self._ungroup_node
        node_id = const.UNGROUPED_NODE_ID
        if self.root_node:
-            node_key = self.root_node.get_next_child_key()
+            node_key = "{}:{}".format(self.root_node.key, self.root_node.child_mark)
        else:
            node_key = '0:0'
        node_value = _("Default")