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

fix: Cannot set original org when exception occurs

pull/14869/head
wangruidong 2025-02-08 10:36:01 +08:00 committed by Bryan
parent dc5ecfcc4b
commit b35a55ed54
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/orgs/utils.py
View File

@ -97,20 +97,24 @@ def get_current_org_id_for_serializer():
@contextmanager
def tmp_to_root_org():
ori_org = get_current_org()
set_to_root_org()
yield
if ori_org is not None:
set_current_org(ori_org)
try:
set_to_root_org()
yield
finally:
if ori_org is not None:
set_current_org(ori_org)
@contextmanager
def tmp_to_org(org):
ori_org = get_current_org()
if org:
set_current_org(org)
yield
if ori_org is not None:
set_current_org(ori_org)
try:
if org:
set_current_org(org)
yield
finally:
if ori_org is not None:
set_current_org(ori_org)
@contextmanager
@ -122,9 +126,10 @@ def tmp_to_builtin_org(system=0, default=0):
else:
raise ValueError("Must set system or default")
ori_org = get_current_org()
set_current_org(org_id)
yield
if ori_org is not None:
try:
set_current_org(org_id)
yield
finally:
set_current_org(ori_org)