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

perf: 修改 CommandFilterACL, CommandGroup __str__

pull/9155/head
Bai 2022-12-04 22:46:47 +08:00
parent 519e0eac01
commit 0cfcfacb6d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/acls/models/command_acl.py
View File

@ -91,7 +91,7 @@ class CommandGroup(JMSOrgBaseModel):
return True, '', pattern return True, '', pattern
def __str__(self): def __str__(self):
return '{} % {}'.format(self.type, self.content) return '{} % {}'.format(self.name, self.type)
class CommandFilterACLQuerySet(UserAssetAccountACLQuerySet): class CommandFilterACLQuerySet(UserAssetAccountACLQuerySet):
@ -113,6 +113,9 @@ class CommandFilterACL(UserAssetAccountBaseACL):
ordering = ('priority', '-date_updated', 'name') ordering = ('priority', '-date_updated', 'name')
verbose_name = _('Command acl') verbose_name = _('Command acl')
def __str__(self):
return self.name
def create_command_confirm_ticket(self, run_command, session, cmd_filter_rule, org_id): def create_command_confirm_ticket(self, run_command, session, cmd_filter_rule, org_id):
from tickets.const import TicketType from tickets.const import TicketType
from tickets.models import ApplyCommandTicket from tickets.models import ApplyCommandTicket