mirror of https://github.com/jumpserver/jumpserver
fix: Domain detail asset amount mistake
parent
29caf0154e
commit
e13741827d
|
@ -31,7 +31,7 @@ class Domain(LabeledMixin, JMSOrgBaseModel):
|
|||
|
||||
@lazyproperty
|
||||
def assets_amount(self):
|
||||
return self.assets.count()
|
||||
return self.assets.exclude(platform__name='Gateway').count()
|
||||
|
||||
def random_gateway(self):
|
||||
gateways = [gw for gw in self.active_gateways if gw.is_connective]
|
||||
|
|
|
@ -57,9 +57,7 @@ class DomainSerializer(ResourceLabelsMixin, BulkOrgResourceModelSerializer):
|
|||
|
||||
@classmethod
|
||||
def setup_eager_loading(cls, queryset):
|
||||
queryset = queryset \
|
||||
.annotate(assets_amount=Count('assets')) \
|
||||
.prefetch_related('labels', 'labels__label')
|
||||
queryset = queryset.prefetch_related('labels', 'labels__label')
|
||||
return queryset
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue