Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
785b375f
Commit
785b375f
authored
Aug 08, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 修复授权列表用户无法搜索的bug
parent
fbfbfcc2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
asset_permission.py
apps/perms/api/asset_permission.py
+11
-0
No files found.
apps/perms/api/asset_permission.py
View file @
785b375f
...
@@ -115,6 +115,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
...
@@ -115,6 +115,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
def
filter_user
(
self
,
queryset
):
def
filter_user
(
self
,
queryset
):
user_id
=
self
.
request
.
query_params
.
get
(
'user_id'
)
user_id
=
self
.
request
.
query_params
.
get
(
'user_id'
)
username
=
self
.
request
.
query_params
.
get
(
'username'
)
username
=
self
.
request
.
query_params
.
get
(
'username'
)
query_group
=
self
.
request
.
query_params
.
get
(
'all'
)
if
user_id
:
if
user_id
:
user
=
get_object_or_none
(
User
,
pk
=
user_id
)
user
=
get_object_or_none
(
User
,
pk
=
user_id
)
elif
username
:
elif
username
:
...
@@ -123,6 +124,15 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
...
@@ -123,6 +124,15 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
return
queryset
return
queryset
if
not
user
:
if
not
user
:
return
queryset
.
none
()
return
queryset
.
none
()
else
:
kwargs
=
{}
args
=
[]
if
query_group
:
groups
=
user
.
groups
.
all
()
args
.
append
(
Q
(
users
=
user
)
|
Q
(
user_groups__in
=
groups
))
else
:
kwargs
[
"users"
]
=
user
return
queryset
.
filter
(
*
args
,
**
kwargs
)
.
distinct
()
def
filter_user_group
(
self
,
queryset
):
def
filter_user_group
(
self
,
queryset
):
user_group_id
=
self
.
request
.
query_params
.
get
(
'user_group_id'
)
user_group_id
=
self
.
request
.
query_params
.
get
(
'user_group_id'
)
...
@@ -148,6 +158,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
...
@@ -148,6 +158,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
def
filter_queryset
(
self
,
queryset
):
def
filter_queryset
(
self
,
queryset
):
queryset
=
super
()
.
filter_queryset
(
queryset
)
queryset
=
super
()
.
filter_queryset
(
queryset
)
queryset
=
self
.
filter_valid
(
queryset
)
queryset
=
self
.
filter_valid
(
queryset
)
queryset
=
self
.
filter_user
(
queryset
)
queryset
=
self
.
filter_keyword
(
queryset
)
queryset
=
self
.
filter_keyword
(
queryset
)
queryset
=
self
.
filter_asset
(
queryset
)
queryset
=
self
.
filter_asset
(
queryset
)
queryset
=
self
.
filter_node
(
queryset
)
queryset
=
self
.
filter_node
(
queryset
)
...
...
Write
Preview
Markdown
is supported
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