diff --git a/apps/assets/models/cmd_filter.py b/apps/assets/models/cmd_filter.py index 72547da19..1ef14bad0 100644 --- a/apps/assets/models/cmd_filter.py +++ b/apps/assets/models/cmd_filter.py @@ -117,6 +117,7 @@ class CommandFilterRule(OrgModelMixin): 'apply_run_command': run_command, 'apply_from_session_id': str(session.id), 'apply_from_cmd_filter_rule_id': str(cmd_filter_rule.id), + 'apply_from_cmd_filter_id': str(cmd_filter_rule.filter.id) }, 'org_id': org_id, } diff --git a/apps/tickets/handler/command_confirm.py b/apps/tickets/handler/command_confirm.py index 0e1fd0d6a..2d66db2d8 100644 --- a/apps/tickets/handler/command_confirm.py +++ b/apps/tickets/handler/command_confirm.py @@ -12,6 +12,7 @@ class Handler(BaseHandler): apply_run_command = self.ticket.meta.get('apply_run_command') apply_from_session_id = self.ticket.meta.get('apply_from_session_id') apply_from_cmd_filter_rule_id = self.ticket.meta.get('apply_from_cmd_filter_rule_id') + apply_from_cmd_filter_id = self.ticket.meta.get('apply_from_cmd_filter_id') applied_body = '''{}: {}, {}: {}, @@ -26,5 +27,6 @@ class Handler(BaseHandler): _("Applied run command"), apply_run_command, _("Applied from session"), apply_from_session_id, _("Applied from command filter rules"), apply_from_cmd_filter_rule_id, + _("Applied from command filter"), apply_from_cmd_filter_id, ) return applied_body diff --git a/apps/tickets/serializers/ticket/meta/ticket_type/command_confirm.py b/apps/tickets/serializers/ticket/meta/ticket_type/command_confirm.py index 4dbdc08fc..eb631fe98 100644 --- a/apps/tickets/serializers/ticket/meta/ticket_type/command_confirm.py +++ b/apps/tickets/serializers/ticket/meta/ticket_type/command_confirm.py @@ -19,6 +19,7 @@ class ApplySerializer(serializers.Serializer): apply_from_cmd_filter_rule_id = serializers.UUIDField( required=False, label=_('From cmd filter rule') ) + apply_from_cmd_filter_id = serializers.UUIDField(required=False, label=_('From cmd filter')) class CommandConfirmSerializer(ApplySerializer):