github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-29 21:51:31 +00:00
Code Issues Projects Releases Wiki Activity

chore: relove conflict

Browse Source
This commit is contained in:
ibuler
2022-12-05 13:41:28 +08:00
parent 80e550b71a 1a9f520c1f
commit 873afd239e
15 changed files with 85 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/authentication/models/connection_token.py
View File

@@ -156,15 +156,15 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
return self.domain.random_gateway()
@lazyproperty
def acl_command_groups(self):
def command_filter_acls(self):
from acls.models import CommandFilterACL
kwargs = {
'user': self.user,
'asset': self.asset,
'account': self.account,
}
command_groups = CommandFilterACL.filter_queryset(**kwargs).get_command_groups()
return command_groups
acls = CommandFilterACL.filter_queryset(**kwargs).valid()
return acls
class SuperConnectionToken(ConnectionToken):