github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-04 00:44:48 +00:00
Code Issues Projects Releases Wiki Activity

perf: rename ad to ds

Browse Source
This commit is contained in:
ibuler
2025-04-07 19:10:12 +08:00
committed by 老广
parent 3f452daee8
commit acaa4cf2d5
35 changed files with 391 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/accounts/models/account.py
View File

@@ -139,17 +139,25 @@ class Account(AbsConnectivity, LabeledMixin, BaseAccount, JSONFilterMixin):
return self.id
@lazyproperty
def ad_domain(self):
def ds_id(self):
if self.username.startswith('@'):
return None
if self.platform.category == 'ad':
return self.asset.ad.domain_name
if self.platform.category == 'ds':
return self.asset.directoryservice.id
return None
@lazyproperty
def ds_domain(self):
if self.username.startswith('@'):
return None
if self.ds_id:
return self.asset.ds.domain_name
return None
@lazyproperty
def full_username(self):
if self.ad_domain:
return '{}@{}'.format(self.username, self.ad_domain)
if self.ds_domain:
return '{}@{}'.format(self.username, self.ds_domain)
return self.username
@lazyproperty