Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
guo xiaoyong
Jumpserver
Commits
19a8a080
Commit
19a8a080
authored
4 years ago
by
xinwen
Committed by
老广
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix(perms): 当用户授权为空时,清空旧的授权树
parent
49c17d18
v2.4
v2.4.5
v2.4.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
apps/perms/utils/user_asset_permission.py
+4
-3
apps/perms/utils/user_asset_permission.py
with
4 additions
and
3 deletions
+4
-3
apps/perms/utils/user_asset_permission.py
+
4
-
3
View file @
19a8a080
...
...
@@ -193,7 +193,7 @@ def compute_tmp_mapping_node_from_perm(user: User, asset_perms_id=None):
return
[
*
leaf_nodes
,
*
ancestors
]
def
create_mapping_nodes
(
user
,
nodes
,
clear
=
True
):
def
create_mapping_nodes
(
user
,
nodes
):
to_create
=
[]
for
node
in
nodes
:
_granted
=
getattr
(
node
,
TMP_GRANTED_FIELD
,
False
)
...
...
@@ -209,8 +209,6 @@ def create_mapping_nodes(user, nodes, clear=True):
assets_amount
=
_granted_assets_amount
,
))
if
clear
:
UserGrantedMappingNode
.
objects
.
filter
(
user
=
user
).
delete
()
UserGrantedMappingNode
.
objects
.
bulk_create
(
to_create
)
...
...
@@ -232,6 +230,9 @@ def set_node_granted_assets_amount(user, node, asset_perms_id=None):
@
tmp_to_root_org
()
def
rebuild_user_mapping_nodes
(
user
):
logger
.
info
(
f
'>>>
{
dt_formater
(
now
())
}
start rebuild
{
user
}
mapping nodes'
)
# 先删除用户旧的授权树🌲
UserGrantedMappingNode
.
objects
.
filter
(
user
=
user
).
delete
()
asset_perms_id
=
get_user_all_assetpermissions_id
(
user
)
if
not
asset_perms_id
:
# 没有授权直接返回
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help