From f6d9af8bebafe126ef07b3d482c6b77b1842cbb2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 19 Oct 2020 20:18:47 +0800 Subject: [PATCH] =?UTF-8?q?perf(application):=20=E4=BC=98=E5=8C=96type?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/applications/serializers/application.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/applications/serializers/application.py b/apps/applications/serializers/application.py index 068a2f4db..d0a5dc1e5 100644 --- a/apps/applications/serializers/application.py +++ b/apps/applications/serializers/application.py @@ -16,7 +16,7 @@ class ApplicationSerializer(BulkOrgResourceModelSerializer): model = models.Application fields = [ 'id', 'name', 'category', 'type', 'get_type_display', 'attrs', - 'created_by', 'date_created', 'date_updated', 'comment' + 'domain', 'created_by', 'date_created', 'date_updated', 'comment' ] read_only_fields = [ 'created_by', 'date_created', 'date_updated', 'get_type_display', @@ -26,15 +26,15 @@ class ApplicationSerializer(BulkOrgResourceModelSerializer): super().__init__(*args, **kwargs) app_type = '' attrs_data = {} - if self.instance: - app_type = self.instance.type - attrs_data = self.instance.attrs request = self.context.get('request') if request: app_type = request.query_params.get('type') if hasattr(self, 'initial_data'): app_type = self.initial_data.get('type') attrs_data = self.initial_data.get('attrs') + if self.instance: + app_type = self.instance.type + attrs_data = self.instance.attrs if not app_type: return attrs_cls = models.Category.get_type_serializer_cls(app_type)