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
5c002e91
Commit
5c002e91
authored
Oct 24, 2018
by
BaiJiangJie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改获取资产distinct
parent
41a88310
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
asset.py
apps/assets/api/asset.py
+3
-3
node.py
apps/assets/models/node.py
+1
-1
No files found.
apps/assets/api/asset.py
View file @
5c002e91
...
@@ -53,14 +53,14 @@ class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet):
...
@@ -53,14 +53,14 @@ class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet):
if
show_current_asset
:
if
show_current_asset
:
self
.
queryset
=
self
.
queryset
.
filter
(
self
.
queryset
=
self
.
queryset
.
filter
(
Q
(
nodes
=
node_id
)
|
Q
(
nodes__isnull
=
True
)
Q
(
nodes
=
node_id
)
|
Q
(
nodes__isnull
=
True
)
)
.
distinct
()
)
return
return
if
show_current_asset
:
if
show_current_asset
:
self
.
queryset
=
self
.
queryset
.
filter
(
nodes
=
node
)
.
distinct
()
self
.
queryset
=
self
.
queryset
.
filter
(
nodes
=
node
)
else
:
else
:
self
.
queryset
=
self
.
queryset
.
filter
(
self
.
queryset
=
self
.
queryset
.
filter
(
nodes__key__regex
=
'^{}(:[0-9]+)*$'
.
format
(
node
.
key
),
nodes__key__regex
=
'^{}(:[0-9]+)*$'
.
format
(
node
.
key
),
)
.
distinct
()
)
def
filter_admin_user_id
(
self
):
def
filter_admin_user_id
(
self
):
admin_user_id
=
self
.
request
.
query_params
.
get
(
'admin_user_id'
)
admin_user_id
=
self
.
request
.
query_params
.
get
(
'admin_user_id'
)
...
...
apps/assets/models/node.py
View file @
5c002e91
...
@@ -124,7 +124,7 @@ class Node(OrgModelMixin):
...
@@ -124,7 +124,7 @@ class Node(OrgModelMixin):
assets
=
Asset
.
objects
.
filter
(
Q
(
nodes__id
=
self
.
id
)
|
Q
(
nodes__isnull
=
True
))
assets
=
Asset
.
objects
.
filter
(
Q
(
nodes__id
=
self
.
id
)
|
Q
(
nodes__isnull
=
True
))
else
:
else
:
assets
=
Asset
.
objects
.
filter
(
nodes__id
=
self
.
id
)
assets
=
Asset
.
objects
.
filter
(
nodes__id
=
self
.
id
)
return
assets
return
assets
.
distinct
()
def
get_valid_assets
(
self
):
def
get_valid_assets
(
self
):
return
self
.
get_assets
()
.
valid
()
return
self
.
get_assets
()
.
valid
()
...
...
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