github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Domain detail asset amount mistake

pull/13973/head
feng 2024-08-14 17:25:16 +08:00 committed by Bryan
parent 29caf0154e
commit e13741827d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/domain.py
View File

@ -31,7 +31,7 @@ class Domain(LabeledMixin, JMSOrgBaseModel):
@lazyproperty @lazyproperty
def assets_amount(self): def assets_amount(self):
return self.assets.count() return self.assets.exclude(platform__name='Gateway').count()
def random_gateway(self): def random_gateway(self):
gateways = [gw for gw in self.active_gateways if gw.is_connective] gateways = [gw for gw in self.active_gateways if gw.is_connective]

4
apps/assets/serializers/domain.py
View File

@ -57,9 +57,7 @@ class DomainSerializer(ResourceLabelsMixin, BulkOrgResourceModelSerializer):
@classmethod @classmethod
def setup_eager_loading(cls, queryset): def setup_eager_loading(cls, queryset):
queryset = queryset \ queryset = queryset.prefetch_related('labels', 'labels__label')
.annotate(assets_amount=Count('assets')) \
.prefetch_related('labels', 'labels__label')
return queryset return queryset