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

fix: 修复用户组织树问题

pull/9214/head
Eric 2022-12-14 18:07:44 +08:00 committed by Eric_Lee
parent d60f9a7c69
commit acfce4961c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/perms/api/user_permission/tree/mixin.py
View File

@ -1,10 +1,8 @@
from rest_framework.request import Request from rest_framework.request import Request
from users.models import User
from common.http import is_true from common.http import is_true
from perms.utils import UserPermTreeRefreshUtil from perms.utils import UserPermTreeRefreshUtil
from users.models import User
__all__ = ['RebuildTreeMixin'] __all__ = ['RebuildTreeMixin']

2
apps/perms/utils/user_perm_tree.py
View File

@ -59,7 +59,7 @@ class UserPermTreeRefreshUtil(_UserPermTreeCacheMixin):
with UserGrantedTreeRebuildLock(self.user.id): with UserGrantedTreeRebuildLock(self.user.id):
for org in to_refresh_orgs: for org in to_refresh_orgs:
self.rebuild_user_perm_tree_for_org(org) self.rebuild_user_perm_tree_for_org(org)
self.mark_user_orgs_refresh_finished(to_refresh_orgs) self.mark_user_orgs_refresh_finished([str(org.id) for org in to_refresh_orgs])
def rebuild_user_perm_tree_for_org(self, org): def rebuild_user_perm_tree_for_org(self, org):
with tmp_to_org(org): with tmp_to_org(org):