From f984acf1b2a9eae90df4dccc1beefa13ccaf03c6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 21 Oct 2019 17:14:49 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=87=B4?= =?UTF-8?q?favorite=20=E5=92=8C=20empty=20=E5=90=8C=E6=97=B6=E5=87=BA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/utils/asset_permission.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/perms/utils/asset_permission.py b/apps/perms/utils/asset_permission.py index 6754511d0..84da4e337 100644 --- a/apps/perms/utils/asset_permission.py +++ b/apps/perms/utils/asset_permission.py @@ -234,6 +234,9 @@ class AssetPermissionUtilV2(AssetPermissionUtilCacheMixin): if user_tree.contains(key): nodes_single_assets.pop(key) + if not nodes_single_assets: + return + # 如果要设置到ungroup中 if settings.PERM_SINGLE_ASSET_TO_UNGROUP_NODE: node_key = Node.ungrouped_key @@ -336,8 +339,8 @@ class AssetPermissionUtilV2(AssetPermissionUtilCacheMixin): self.add_direct_nodes_to_user_tree(user_tree) self.add_single_assets_node_to_user_tree(user_tree) self.parse_user_tree_to_full_tree(user_tree) - self.add_empty_node_if_need(user_tree) self.add_favorite_node_if_need(user_tree) + self.add_empty_node_if_need(user_tree) self.set_user_tree_to_cache_if_need(user_tree) self.set_user_tree_to_local(user_tree) return user_tree