From 5a3c67989b7ff58f81e7830f90573494661a7a46 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 26 Apr 2021 18:52:25 +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;=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/cmd_filter.py | 4 ++-- apps/tickets/handler/command_confirm.py | 8 ++++---- apps/tickets/serializers/ticket/meta/meta.py | 9 ++++++++- .../ticket/meta/ticket_type/command_confirm.py | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/apps/assets/models/cmd_filter.py b/apps/assets/models/cmd_filter.py index dff99298c..72547da19 100644 --- a/apps/assets/models/cmd_filter.py +++ b/apps/assets/models/cmd_filter.py @@ -115,8 +115,8 @@ class CommandFilterRule(OrgModelMixin): 'apply_run_asset': session.asset, 'apply_run_system_user': session.system_user, 'apply_run_command': run_command, - 'apply_from_session': str(session.id), - 'apply_from_cmd_filter_rule': str(cmd_filter_rule.id), + 'apply_from_session_id': str(session.id), + 'apply_from_cmd_filter_rule_id': str(cmd_filter_rule.id), }, 'org_id': org_id, } diff --git a/apps/tickets/handler/command_confirm.py b/apps/tickets/handler/command_confirm.py index 33d6739e3..0e1fd0d6a 100644 --- a/apps/tickets/handler/command_confirm.py +++ b/apps/tickets/handler/command_confirm.py @@ -10,8 +10,8 @@ class Handler(BaseHandler): apply_run_asset = self.ticket.meta.get('apply_run_asset') apply_run_system_user = self.ticket.meta.get('apply_run_system_user') apply_run_command = self.ticket.meta.get('apply_run_command') - apply_from_session = self.ticket.meta.get('apply_from_session') - apply_from_cmd_filter_rule = self.ticket.meta.get('apply_from_cmd_filter_rule') + 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') applied_body = '''{}: {}, {}: {}, @@ -24,7 +24,7 @@ class Handler(BaseHandler): _("Applied run asset"), apply_run_asset, _("Applied run system user"), apply_run_system_user, _("Applied run command"), apply_run_command, - _("Applied from session"), apply_from_session, - _("Applied from command filter rules"), apply_from_cmd_filter_rule, + _("Applied from session"), apply_from_session_id, + _("Applied from command filter rules"), apply_from_cmd_filter_rule_id, ) return applied_body diff --git a/apps/tickets/serializers/ticket/meta/meta.py b/apps/tickets/serializers/ticket/meta/meta.py index ee8a402dd..12b576857 100644 --- a/apps/tickets/serializers/ticket/meta/meta.py +++ b/apps/tickets/serializers/ticket/meta/meta.py @@ -1,5 +1,7 @@ from tickets import const -from .ticket_type import apply_asset, apply_application, login_confirm, login_asset_confirm +from .ticket_type import ( + apply_asset, apply_application, login_confirm, login_asset_confirm, command_confirm +) __all__ = [ 'type_serializer_classes_mapping', @@ -35,5 +37,10 @@ type_serializer_classes_mapping = { 'default': login_asset_confirm.LoginAssetConfirmSerializer, action_open: login_asset_confirm.ApplySerializer, action_approve: login_asset_confirm.LoginAssetConfirmSerializer(read_only=True), + }, + const.TicketTypeChoices.command_confirm.value: { + 'default': command_confirm.CommandConfirmSerializer, + action_open: command_confirm.ApplySerializer, + action_approve: command_confirm.CommandConfirmSerializer(read_only=True) } } 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 92c72f920..4dbdc08fc 100644 --- a/apps/tickets/serializers/ticket/meta/ticket_type/command_confirm.py +++ b/apps/tickets/serializers/ticket/meta/ticket_type/command_confirm.py @@ -15,8 +15,8 @@ class ApplySerializer(serializers.Serializer): required=True, max_length=64, label=_('Run system user') ) apply_run_command = serializers.CharField(required=True, label=_('Run command')) - apply_from_session = serializers.UUIDField(required=False, label=_('From session')) - apply_from_cmd_filter_rule = serializers.UUIDField( + apply_from_session_id = serializers.UUIDField(required=False, label=_('From session')) + apply_from_cmd_filter_rule_id = serializers.UUIDField( required=False, label=_('From cmd filter rule') )