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

fix: 修复操作应用/应用授权/acl等未记录日志的问题2

pull/6018/head
Bai 2021-04-20 16:44:14 +08:00 committed by Jiangjie.Bai
parent 4a4d5f3243
commit 65ad63272c
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/acls/models/login_acl.py
View File

@ -33,6 +33,9 @@ class LoginACL(BaseACL):
class Meta: class Meta:
ordering = ('priority', '-date_updated', 'name') ordering = ('priority', '-date_updated', 'name')
def __str__(self):
return self.name
@property @property
def action_reject(self): def action_reject(self):
return self.action == self.ActionChoices.reject return self.action == self.ActionChoices.reject

3
apps/acls/models/login_asset_acl.py
View File

@ -38,6 +38,9 @@ class LoginAssetACL(BaseACL, OrgModelMixin):
unique_together = ('name', 'org_id') unique_together = ('name', 'org_id')
ordering = ('priority', '-date_updated', 'name') ordering = ('priority', '-date_updated', 'name')
def __str__(self):
return self.name
@classmethod @classmethod
def filter(cls, user, asset, system_user, action): def filter(cls, user, asset, system_user, action):
queryset = cls.objects.filter(action=action) queryset = cls.objects.filter(action=action)