From 28f08251b3d550140c099d52c7fcadc8d7e95cef Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 18 Apr 2023 20:10:51 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=97=B6=EF=BC=8Caccount=20=E7=9A=84?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20(#10247)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf: 修复创建资产时,account 的校验 * perf: 优化一下提示 --------- Co-authored-by: ibuler --- apps/accounts/serializers/account/account.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/accounts/serializers/account/account.py b/apps/accounts/serializers/account/account.py index f92f7d93d..72576b548 100644 --- a/apps/accounts/serializers/account/account.py +++ b/apps/accounts/serializers/account/account.py @@ -53,7 +53,7 @@ class AccountCreateUpdateSerializerMixin(serializers.Serializer): for data in initial_data: if not data.get('asset') and not self.instance: - raise serializers.ValidationError({'asset': 'Asset is required'}) + raise serializers.ValidationError({'asset': UniqueTogetherValidator.missing_message}) asset = data.get('asset') or self.instance.asset self.from_template_if_need(data) self.set_uniq_name_if_need(data, asset) @@ -111,8 +111,9 @@ class AccountCreateUpdateSerializerMixin(serializers.Serializer): _validators = super().get_validators() if getattr(self, 'initial_data', None) is None: return _validators + on_invalid = self.initial_data.get('on_invalid') - if on_invalid == AccountInvalidPolicy.ERROR: + if on_invalid == AccountInvalidPolicy.ERROR and not self.parent: return _validators _validators = [v for v in _validators if not isinstance(v, UniqueTogetherValidator)] return _validators