From 15992ad5b322d3183f5fd6e449b27141255668ac Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 19 Aug 2020 21:47:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(tickets):=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E5=8D=95comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/orgs/serializers.py | 2 +- apps/tickets/api/request_asset_perm.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/orgs/serializers.py b/apps/orgs/serializers.py index 6d52fdc23..c36d67d89 100644 --- a/apps/orgs/serializers.py +++ b/apps/orgs/serializers.py @@ -6,7 +6,7 @@ from users.models.user import User from common.serializers import AdaptedBulkListSerializer from common.drf.serializers import BulkModelSerializer from common.db.models import concated_display as display -from .models import Organization, OrganizationMember, ROLE as ORG_ROLE +from .models import Organization, OrganizationMember class OrgSerializer(ModelSerializer): diff --git a/apps/tickets/api/request_asset_perm.py b/apps/tickets/api/request_asset_perm.py index d33ea34cf..5bfedabe0 100644 --- a/apps/tickets/api/request_asset_perm.py +++ b/apps/tickets/api/request_asset_perm.py @@ -1,3 +1,5 @@ +import textwrap + from django.db.models import Q from django.utils.translation import ugettext_lazy as _ from rest_framework.decorators import action @@ -62,13 +64,13 @@ class RequestAssetPermTicketViewSet(JMSModelViewSet): ips = ', '.join(meta.get('ips', [])) confirmed_assets = ', '.join(meta.get('confirmed_assets', [])) - return f''' + return textwrap.dedent(f'''\ {_('IP group')}: {ips} {_('Hostname')}: {meta.get('hostname', '')} {_('System user')}: {meta.get('system_user', '')} {_('Confirmed assets')}: {confirmed_assets} {_('Confirmed system user')}: {meta.get('confirmed_system_user', '')} - ''' + ''') @action(detail=True, methods=[POST], permission_classes=[IsAssignee, IsValidUser]) def reject(self, request, *args, **kwargs):