From 4a9e83ba151ce3f4afbec055042e8732961a4463 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 27 Apr 2021 17:48:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91;=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=A4=8D=E6=A0=B8=E5=B7=A5=E5=8D=95;=205?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/cmd_filter.py                                | 1 +
 apps/tickets/handler/command_confirm.py                         | 2 ++
 .../serializers/ticket/meta/ticket_type/command_confirm.py      | 1 +
 3 files changed, 4 insertions(+)

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):