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

perf: 优化 acl 默认排序和manager

Browse Source
This commit is contained in:
ibuler
2023-06-12 13:59:54 +08:00
committed by Jiangjie.Bai
parent fc90ced2b0
commit dc35a8c52b
6 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/acls/models/base.py
View File

@@ -6,7 +6,7 @@ from common.db.fields import JSONManyToManyField
from common.db.models import JMSBaseModel
from common.utils import contains_ip
from common.utils.time_period import contains_time_period
from orgs.mixins.models import OrgModelMixin
from orgs.mixins.models import OrgModelMixin, OrgManager
__all__ = [
'BaseACL', 'UserBaseACL', 'UserAssetAccountBaseACL',
@@ -48,7 +48,7 @@ class BaseACL(JMSBaseModel):
objects = BaseACLQuerySet.as_manager()
class Meta:
ordering = ('priority', 'date_updated', 'name')
ordering = ('priority', 'name')
abstract = True
def is_action(self, action):
@@ -97,6 +97,7 @@ class UserAssetAccountBaseACL(OrgModelMixin, UserBaseACL):
name = models.CharField(max_length=128, verbose_name=_('Name'))
assets = JSONManyToManyField('assets.Asset', default=dict, verbose_name=_('Assets'))
accounts = models.JSONField(default=list, verbose_name=_("Accounts"))
objects = OrgManager.from_queryset(BaseACLQuerySet)()
class Meta(UserBaseACL.Meta):
unique_together = [('name', 'org_id')]
@@ -125,4 +126,4 @@ class UserAssetAccountBaseACL(OrgModelMixin, UserBaseACL):
kwargs['org_id'] = org_id
if kwargs:
queryset = queryset.filter(**kwargs)
return queryset.filter(is_active=True).distinct().order_by('priority', 'date_created')
return queryset.valid().distinct()