github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 优化刚才修改导致的 acls 过滤没有过滤组织

pull/10657/head
ibuler 2023-06-08 16:25:31 +08:00 committed by Jiangjie.Bai
parent 41e147d4b2
commit 271ec1bfe0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ class BaseACL(JMSBaseModel):
class UserBaseACL(BaseACL):
users = JSONManyToManyField('users.User', default=dict, verbose_name=_('Users'))
class Meta:
class Meta(BaseACL.Meta):
abstract = True
@classmethod
@ -93,7 +93,7 @@ class UserBaseACL(BaseACL):
return queryset.valid().distinct()
class UserAssetAccountBaseACL(UserBaseACL, OrgModelMixin):
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"))