From 4f23090a5cfc0fdf9755316935e7c7e5a31f6e79 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 12 Jul 2021 18:20:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=205xx=20(#6413)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ibuler Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com> --- apps/assets/models/authbook.py | 6 ++++++ apps/assets/serializers/account.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/assets/models/authbook.py b/apps/assets/models/authbook.py index cf72d37b0..493ed1126 100644 --- a/apps/assets/models/authbook.py +++ b/apps/assets/models/authbook.py @@ -63,6 +63,12 @@ class AuthBook(BaseUser, AbsConnectivity): def username_display(self): return self.get_or_systemuser_attr('username') or '*' + @property + def systemuser_display(self): + if not self.systemuser: + return '' + return str(self.systemuser) + @property def smart_name(self): username = self.username_display diff --git a/apps/assets/serializers/account.py b/apps/assets/serializers/account.py index 5f26b7d32..49fac52ac 100644 --- a/apps/assets/serializers/account.py +++ b/apps/assets/serializers/account.py @@ -17,7 +17,7 @@ class AccountSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer): fields_write_only = ['password', 'private_key', "public_key"] fields_other = ['date_created', 'date_updated', 'connectivity', 'date_verified', 'comment'] fields_small = fields_mini + fields_write_only + fields_other - fields_fk = ['asset', 'systemuser'] + fields_fk = ['asset', 'systemuser', 'systemuser_display'] fields = fields_small + fields_fk extra_kwargs = { 'username': {'required': True},