mirror of https://github.com/jumpserver/jumpserver
perf: 优化刚才修改导致的 acls 过滤没有过滤组织
parent
41e147d4b2
commit
271ec1bfe0
|
@ -82,7 +82,7 @@ class BaseACL(JMSBaseModel):
|
||||||
class UserBaseACL(BaseACL):
|
class UserBaseACL(BaseACL):
|
||||||
users = JSONManyToManyField('users.User', default=dict, verbose_name=_('Users'))
|
users = JSONManyToManyField('users.User', default=dict, verbose_name=_('Users'))
|
||||||
|
|
||||||
class Meta:
|
class Meta(BaseACL.Meta):
|
||||||
abstract = True
|
abstract = True
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -93,7 +93,7 @@ class UserBaseACL(BaseACL):
|
||||||
return queryset.valid().distinct()
|
return queryset.valid().distinct()
|
||||||
|
|
||||||
|
|
||||||
class UserAssetAccountBaseACL(UserBaseACL, OrgModelMixin):
|
class UserAssetAccountBaseACL(OrgModelMixin, UserBaseACL):
|
||||||
name = models.CharField(max_length=128, verbose_name=_('Name'))
|
name = models.CharField(max_length=128, verbose_name=_('Name'))
|
||||||
assets = JSONManyToManyField('assets.Asset', default=dict, verbose_name=_('Assets'))
|
assets = JSONManyToManyField('assets.Asset', default=dict, verbose_name=_('Assets'))
|
||||||
accounts = models.JSONField(default=list, verbose_name=_("Accounts"))
|
accounts = models.JSONField(default=list, verbose_name=_("Accounts"))
|
||||||
|
|
Loading…
Reference in New Issue