github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-03 08:25:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into lina

Browse Source
This commit is contained in:
ibuler
2020-04-29 13:00:47 +08:00
parent 230d6137f3 c16a986c4b
commit 0c0c0e6d6f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/assets/models/asset.py
View File

@@ -41,11 +41,10 @@ def default_node():
class AssetManager(OrgManager): class AssetManager(OrgManager):
# def get_queryset(self): def get_queryset(self):
# return super().get_queryset().annotate( return super().get_queryset().annotate(
# platform_base=models.F('platform__base') platform_base=models.F('platform__base')
# ) )
pass
class AssetQuerySet(models.QuerySet): class AssetQuerySet(models.QuerySet):