From 615f36c6f695de07434ec0204cc7f33c0bec6ac8 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Tue, 20 Sep 2022 16:18:23 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=B6=E9=9B=86=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/asset/asset.py | 6 +++--- apps/assets/const.py | 2 +- apps/assets/models/gathered_user.py | 2 +- apps/assets/serializers/__init__.py | 2 +- apps/assets/serializers/{ => account}/backup.py | 2 +- apps/assets/serializers/account/common.py | 3 +-- apps/assets/serializers/gathered_user.py | 5 ++--- apps/assets/task_handlers/backup/handlers.py | 2 +- apps/authentication/urls/api_urls.py | 2 +- apps/common/drf/serializers.py | 2 +- 10 files changed, 13 insertions(+), 15 deletions(-) rename apps/assets/serializers/{ => account}/backup.py (95%) diff --git a/apps/assets/api/asset/asset.py b/apps/assets/api/asset/asset.py index a4175b58a..fde2c5ed1 100644 --- a/apps/assets/api/asset/asset.py +++ b/apps/assets/api/asset/asset.py @@ -1,16 +1,16 @@ # -*- coding: utf-8 -*- # +import django_filters from rest_framework.decorators import action from rest_framework.response import Response -import django_filters +from common.utils import get_logger from common.drf.filters import BaseFilterSet -from common.utils import get_logger, get_object_or_none from common.mixins.api import SuggestionMixin from orgs.mixins.api import OrgBulkModelViewSet from orgs.mixins import generics -from assets.models import Asset, Node, Gateway from assets import serializers +from assets.models import Asset, Gateway from assets.tasks import ( update_assets_hardware_info_manual, test_assets_connectivity_manual, ) diff --git a/apps/assets/const.py b/apps/assets/const.py index 9c5603052..073b5f60a 100644 --- a/apps/assets/const.py +++ b/apps/assets/const.py @@ -232,7 +232,7 @@ class AllTypes(ChoicesMixin, metaclass=IncludesTextChoicesMeta): @staticmethod def serialize_to_objs(choices): - title = ['value', 'display_name'] + title = ['value', 'label'] return [dict(zip(title, choice)) for choice in choices] @staticmethod diff --git a/apps/assets/models/gathered_user.py b/apps/assets/models/gathered_user.py index b00ea0843..e8a2de825 100644 --- a/apps/assets/models/gathered_user.py +++ b/apps/assets/models/gathered_user.py @@ -20,7 +20,7 @@ class GatheredUser(OrgModelMixin): date_updated = models.DateTimeField(auto_now=True, verbose_name=_("Date updated")) @property - def hostname(self): + def name(self): return self.asset.name @property diff --git a/apps/assets/serializers/__init__.py b/apps/assets/serializers/__init__.py index ef4b40abe..93a122209 100644 --- a/apps/assets/serializers/__init__.py +++ b/apps/assets/serializers/__init__.py @@ -8,5 +8,5 @@ from .domain import * from .gathered_user import * from .favorite_asset import * from .account import * -from .backup import * +from assets.serializers.account.backup import * from .platform import * diff --git a/apps/assets/serializers/backup.py b/apps/assets/serializers/account/backup.py similarity index 95% rename from apps/assets/serializers/backup.py rename to apps/assets/serializers/account/backup.py index c95a806d3..455ef5bf3 100644 --- a/apps/assets/serializers/backup.py +++ b/apps/assets/serializers/account/backup.py @@ -7,7 +7,7 @@ from orgs.mixins.serializers import BulkOrgResourceModelSerializer from ops.mixin import PeriodTaskSerializerMixin from common.utils import get_logger -from ..models import AccountBackupPlan, AccountBackupPlanExecution +from assets.models import AccountBackupPlan, AccountBackupPlanExecution logger = get_logger(__file__) diff --git a/apps/assets/serializers/account/common.py b/apps/assets/serializers/account/common.py index 6e8022aa7..e20f21239 100644 --- a/apps/assets/serializers/account/common.py +++ b/apps/assets/serializers/account/common.py @@ -8,8 +8,7 @@ __all__ = ['AccountFieldsSerializerMixin'] class AccountFieldsSerializerMixin(serializers.ModelSerializer): class Meta: fields_mini = [ - 'id', 'name', 'username', 'privileged', - 'platform', 'version' + 'id', 'name', 'username', 'privileged', 'platform', 'version' ] fields_write_only = ['password', 'private_key', 'public_key', 'passphrase'] fields_other = ['date_created', 'date_updated', 'comment'] diff --git a/apps/assets/serializers/gathered_user.py b/apps/assets/serializers/gathered_user.py index 572b9f80b..6cb90f46e 100644 --- a/apps/assets/serializers/gathered_user.py +++ b/apps/assets/serializers/gathered_user.py @@ -12,11 +12,10 @@ class GatheredUserSerializer(OrgResourceModelSerializerMixin): model = GatheredUser fields_mini = ['id'] fields_small = fields_mini + [ - 'username', 'ip_last_login', - 'present', + 'username', 'ip_last_login', 'present', 'name', 'date_last_login', 'date_created', 'date_updated' ] - fields_fk = ['asset', 'name', 'ip'] + fields_fk = ['asset', 'ip'] fields = fields_small + fields_fk read_only_fields = fields extra_kwargs = { diff --git a/apps/assets/task_handlers/backup/handlers.py b/apps/assets/task_handlers/backup/handlers.py index d8c7955c9..2addebb86 100644 --- a/apps/assets/task_handlers/backup/handlers.py +++ b/apps/assets/task_handlers/backup/handlers.py @@ -90,7 +90,7 @@ class AssetAccountHandler(BaseAccountHandler): category_dict = {} for i in AllTypes.grouped_choices_to_objs(): for j in i['children']: - category_dict[j['value']] = j['display_name'] + category_dict[j['value']] = j['label'] header_fields = cls.get_header_fields(AccountSecretSerializer(qs.first())) account_category_map = defaultdict(list) diff --git a/apps/authentication/urls/api_urls.py b/apps/authentication/urls/api_urls.py index cfbac879f..bca9d7430 100644 --- a/apps/authentication/urls/api_urls.py +++ b/apps/authentication/urls/api_urls.py @@ -32,7 +32,7 @@ urlpatterns = [ path('mfa/verify/', api.MFAChallengeVerifyApi.as_view(), name='mfa-verify'), path('mfa/challenge/', api.MFAChallengeVerifyApi.as_view(), name='mfa-challenge'), path('mfa/select/', api.MFASendCodeApi.as_view(), name='mfa-select'), - path('mfa/send-code/', api.MFASendCodeApi.as_view(), name='mfa-send-codej'), + path('mfa/send-code/', api.MFASendCodeApi.as_view(), name='mfa-send-code'), path('password/verify/', api.UserPasswordVerifyApi.as_view(), name='user-password-verify'), path('login-confirm-ticket/status/', api.TicketStatusApi.as_view(), name='login-confirm-ticket-status'), ] diff --git a/apps/common/drf/serializers.py b/apps/common/drf/serializers.py index ab6df10f7..aa0023b90 100644 --- a/apps/common/drf/serializers.py +++ b/apps/common/drf/serializers.py @@ -87,7 +87,7 @@ class CeleryTaskSerializer(serializers.Serializer): class ChoiceSerializer(serializers.Serializer): - display_name = serializers.CharField(label=_("Display name")) + label = serializers.CharField(label=_("Label")) value = serializers.CharField(label=_("Value"))