Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
a47a9c03
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a47a9c03
编写于
3月 18, 2021
作者:
X
xinwen
提交者:
Jiangjie.Bai
3月 18, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: Root 组织用户从用户组移除报错
上级
4e0c0568
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
4 deletion
+8
-4
apps/perms/signals_handler/refresh_perms.py
apps/perms/signals_handler/refresh_perms.py
+8
-4
未找到文件。
apps/perms/signals_handler/refresh_perms.py
浏览文件 @
a47a9c03
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
from
django.db.models.signals
import
m2m_changed
,
pre_delete
,
pre_save
,
post_save
from
django.db.models.signals
import
m2m_changed
,
pre_delete
,
pre_save
,
post_save
from
django.dispatch
import
receiver
from
django.dispatch
import
receiver
from
users.models
import
User
from
users.models
import
User
,
UserGroup
from
assets.models
import
Asset
from
assets.models
import
Asset
from
orgs.utils
import
current_org
,
tmp_to_org
from
orgs.utils
import
current_org
,
tmp_to_org
from
common.utils
import
get_logger
from
common.utils
import
get_logger
...
@@ -23,16 +23,20 @@ def on_user_groups_change(sender, instance, action, reverse, pk_set, **kwargs):
...
@@ -23,16 +23,20 @@ def on_user_groups_change(sender, instance, action, reverse, pk_set, **kwargs):
if
reverse
:
if
reverse
:
group_ids
=
[
instance
.
id
]
group_ids
=
[
instance
.
id
]
user_ids
=
pk_set
user_ids
=
pk_set
org_id
=
instance
.
org_id
else
:
else
:
group_ids
=
pk_set
group_ids
=
pk_set
user_ids
=
[
instance
.
id
]
user_ids
=
[
instance
.
id
]
group
=
UserGroup
.
objects
.
get
(
id
=
group_ids
[
0
])
org_id
=
group
.
org_id
exists
=
AssetPermission
.
user_groups
.
through
.
objects
.
filter
(
usergroup_id__in
=
group_ids
).
exists
()
exists
=
AssetPermission
.
user_groups
.
through
.
objects
.
filter
(
usergroup_id__in
=
group_ids
).
exists
()
if
not
exists
:
if
not
exists
:
return
return
with
tmp_to_org
(
instance
.
org
):
org_ids
=
[
current_org
.
id
]
org_ids
=
[
org_
id
]
UserGrantedTreeRefreshController
.
add_need_refresh_orgs_for_users
(
org_ids
,
user_ids
)
UserGrantedTreeRefreshController
.
add_need_refresh_orgs_for_users
(
org_ids
,
user_ids
)
@
receiver
([
pre_delete
],
sender
=
AssetPermission
)
@
receiver
([
pre_delete
],
sender
=
AssetPermission
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录