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/14874/head
wangruidong 2025-02-08 11:14:22 +08:00 committed by Bryan
parent 25603e4758
commit 1d36934111
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
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
@ -121,11 +125,13 @@ def tmp_to_builtin_org(system=0, default=0):
org_id = Organization.DEFAULT_ID
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:
set_current_org(ori_org)
try:
ori_org = get_current_org()
set_current_org(org_id)
yield
finally:
if ori_org is not None:
set_current_org(ori_org)
def filter_org_queryset(queryset):