From bd0c50a3e4d235869e26f59eaa676dbbe82b2dd0 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 May 2025 18:34:35 +0800 Subject: [PATCH] fix: account username has domain, then set again --- apps/accounts/models/account.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/accounts/models/account.py b/apps/accounts/models/account.py index 060948fe1..2624e921a 100644 --- a/apps/accounts/models/account.py +++ b/apps/accounts/models/account.py @@ -166,9 +166,12 @@ class Account(AbsConnectivity, LabeledMixin, BaseAccount, JSONFilterMixin): return self.ds.domain_name return '' + def username_has_domain(self): + return '@' in self.username or '\\' in self.username + @property def full_username(self): - if self.ds_domain: + if not self.username_has_domain() and self.ds_domain: return '{}@{}'.format(self.username, self.ds_domain) return self.username