diff --git a/apps/acls/models/command_acl.py b/apps/acls/models/command_acl.py index 8c920c5e7..51e8c7388 100644 --- a/apps/acls/models/command_acl.py +++ b/apps/acls/models/command_acl.py @@ -91,7 +91,7 @@ class CommandGroup(JMSOrgBaseModel): return True, '', pattern def __str__(self): - return '{} % {}'.format(self.type, self.content) + return '{} % {}'.format(self.name, self.type) class CommandFilterACLQuerySet(UserAssetAccountACLQuerySet): @@ -113,6 +113,9 @@ class CommandFilterACL(UserAssetAccountBaseACL): ordering = ('priority', '-date_updated', 'name') verbose_name = _('Command acl') + def __str__(self): + return self.name + def create_command_confirm_ticket(self, run_command, session, cmd_filter_rule, org_id): from tickets.const import TicketType from tickets.models import ApplyCommandTicket