github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-21 03:19:52 +00:00
Code Issues Projects Releases Wiki Activity

perf: 优化部署 host

Browse Source
This commit is contained in:
ibuler
2022-11-01 11:52:51 +08:00
parent 8df15cb564
commit cf81f08b7a
24 changed files with 186 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/orgs/mixins/models.py
View File

@@ -20,16 +20,15 @@ __all__ = [
class OrgManager(models.Manager):
def all_group_by_org(self):
from ..models import Organization
orgs = list(Organization.objects.all())
querysets = {}
org_queryset = {}
for org in orgs:
org_id = org.id
queryset = super(OrgManager, self).get_queryset().filter(org_id=org_id)
querysets[org] = queryset
return querysets
org_queryset[org] = queryset
return org_queryset
def get_queryset(self):
queryset = super(OrgManager, self).get_queryset()
@@ -46,7 +45,7 @@ class OrgManager(models.Manager):
for obj in objs:
if org.is_root():
if not obj.org_id:
raise ValidationError('Please save in a organization')
raise ValidationError('Please save in a org')
else:
obj.org_id = org.id
return super().bulk_create(objs, batch_size, ignore_conflicts)
@@ -54,20 +53,24 @@ class OrgManager(models.Manager):
class OrgModelMixin(models.Model):
org_id = models.CharField(
max_length=36, blank=True, default='', verbose_name=_("Organization"), db_index=True
max_length=36, blank=True, default='',
verbose_name=_("Organization"), db_index=True
)
objects = OrgManager()
sep = '@'
def save(self, *args, **kwargs):
org = get_current_org()
locking_org = getattr(self, 'locking_org', None)
if locking_org:
org = Organization.get_instance(locking_org)
else:
org = get_current_org()
# 这里不可以优化成, 因为 root 组织下可以设置组织 id 来保存
# if org.is_root() and not self.org_id:
# raise ...
if org.is_root():
if not self.org_id:
raise ValidationError('Please save in a organization')
raise ValidationError('Please save in a org')
else:
self.org_id = org.id
return super().save(*args, **kwargs)
@@ -87,8 +90,6 @@ class OrgModelMixin(models.Model):
name = getattr(self, attr)
elif hasattr(self, 'name'):
name = self.name
elif hasattr(self, 'name'):
name = self.hostname
return name + self.sep + self.org_name
def validate_unique(self, exclude=None):