From f6c24f809ced95abfe1f771f6eedb2ed716255a5 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 30 Oct 2020 15:57:12 +0800 Subject: [PATCH] =?UTF-8?q?perf(application):=20=E4=BF=AE=E6=94=B9DoaminAP?= =?UTF-8?q?I=E8=BF=94=E5=9B=9Eapplication=E6=95=B0=E9=87=8F;=E4=BF=AE?= =?UTF-8?q?=E6=94=B9Application=E6=95=B0=E6=8D=AE=E5=BA=93datbase=E5=AD=97?= =?UTF-8?q?=E6=AE=B5required=3DFalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/applications/serializers/database_app.py | 2 +- apps/assets/serializers/domain.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/applications/serializers/database_app.py b/apps/applications/serializers/database_app.py index 84e4ee2c2..fb7c74d42 100644 --- a/apps/applications/serializers/database_app.py +++ b/apps/applications/serializers/database_app.py @@ -13,7 +13,7 @@ class DBAttrsSerializer(serializers.Serializer): host = serializers.CharField(max_length=128, label=_('Host')) port = serializers.IntegerField(label=_('Port')) database = serializers.CharField( - max_length=128, allow_blank=True, allow_null=True, label=_('Database') + max_length=128, required=False, allow_blank=True, allow_null=True, label=_('Database') ) diff --git a/apps/assets/serializers/domain.py b/apps/assets/serializers/domain.py index 8cb103962..9f58e32a6 100644 --- a/apps/assets/serializers/domain.py +++ b/apps/assets/serializers/domain.py @@ -11,6 +11,7 @@ from .base import AuthSerializerMixin class DomainSerializer(BulkOrgResourceModelSerializer): asset_count = serializers.SerializerMethodField() + application_count = serializers.SerializerMethodField() gateway_count = serializers.SerializerMethodField() class Meta: @@ -20,7 +21,7 @@ class DomainSerializer(BulkOrgResourceModelSerializer): 'comment', 'date_created' ] fields_m2m = [ - 'asset_count', 'assets', 'gateway_count', + 'asset_count', 'assets', 'application_count', 'gateway_count', ] fields = fields_small + fields_m2m read_only_fields = ('asset_count', 'gateway_count', 'date_created') @@ -33,6 +34,10 @@ class DomainSerializer(BulkOrgResourceModelSerializer): def get_asset_count(obj): return obj.assets.count() + @staticmethod + def get_application_count(obj): + return obj.applications.count() + @staticmethod def get_gateway_count(obj): return obj.gateway_set.all().count()