mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-07-05 19:16:37 +00:00
fix: account username has domain, then set again
This commit is contained in:
parent
9f121723c4
commit
bd0c50a3e4
@ -166,9 +166,12 @@ class Account(AbsConnectivity, LabeledMixin, BaseAccount, JSONFilterMixin):
|
|||||||
return self.ds.domain_name
|
return self.ds.domain_name
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
|
def username_has_domain(self):
|
||||||
|
return '@' in self.username or '\\' in self.username
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def full_username(self):
|
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 '{}@{}'.format(self.username, self.ds_domain)
|
||||||
return self.username
|
return self.username
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user