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
5f2ca58d
Commit
5f2ca58d
authored
Jan 31, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 修改label api bug
parent
1c721201
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
label.py
apps/assets/models/label.py
+0
-4
serializers.py
apps/assets/serializers.py
+1
-1
No files found.
apps/assets/models/label.py
View file @
5f2ca58d
...
@@ -29,10 +29,6 @@ class Label(models.Model):
...
@@ -29,10 +29,6 @@ class Label(models.Model):
for
name
in
names
:
for
name
in
names
:
yield
name
,
cls
.
objects
.
filter
(
name
=
name
)
yield
name
,
cls
.
objects
.
filter
(
name
=
name
)
@property
def
asset_count
(
self
):
return
self
.
assets
.
count
()
def
__str__
(
self
):
def
__str__
(
self
):
return
"{}:{}"
.
format
(
self
.
name
,
self
.
value
)
return
"{}:{}"
.
format
(
self
.
name
,
self
.
value
)
...
...
apps/assets/serializers.py
View file @
5f2ca58d
...
@@ -297,7 +297,7 @@ class LabelSerializer(serializers.ModelSerializer):
...
@@ -297,7 +297,7 @@ class LabelSerializer(serializers.ModelSerializer):
@staticmethod
@staticmethod
def
get_asset_count
(
obj
):
def
get_asset_count
(
obj
):
return
obj
.
asset
_count
return
obj
.
asset
s
.
count
()
def
get_field_names
(
self
,
declared_fields
,
info
):
def
get_field_names
(
self
,
declared_fields
,
info
):
fields
=
super
()
.
get_field_names
(
declared_fields
,
info
)
fields
=
super
()
.
get_field_names
(
declared_fields
,
info
)
...
...
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