From f5d086702a4ceb76cb0e56981776e6ed7086aca5 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 21 Feb 2023 12:12:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api/applet/host.py | 2 +- apps/terminal/models/applet/host.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/terminal/api/applet/host.py b/apps/terminal/api/applet/host.py index 40c0c6caf..38c42cd18 100644 --- a/apps/terminal/api/applet/host.py +++ b/apps/terminal/api/applet/host.py @@ -58,7 +58,7 @@ class AppletHostDeploymentViewSet(viewsets.ModelViewSet): def applets(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) - applet_id = serializer.validated_data.get('applet_id') + applet_id = serializer.validated_data.pop('applet_id') instance = serializer.save() task = run_applet_host_deployment_install_applet.delay(instance.id, applet_id) instance.save_task(task.id) diff --git a/apps/terminal/models/applet/host.py b/apps/terminal/models/applet/host.py index e179a8380..47de718df 100644 --- a/apps/terminal/models/applet/host.py +++ b/apps/terminal/models/applet/host.py @@ -10,6 +10,7 @@ from simple_history.utils import bulk_create_with_history from assets.models import Host from common.db.models import JMSBaseModel from common.utils import random_string +from terminal.const import PublishStatus __all__ = ['AppletHost', 'AppletHostDeployment'] @@ -63,11 +64,11 @@ class AppletHost(Host): status_applets = defaultdict(list) for applet in applets: if applet.name not in name_version_mapper: - status_applets['unpublished'].append(applet) + status_applets[PublishStatus.failed.value].append(applet) elif applet.version != name_version_mapper[applet.name]: - status_applets['not_match'].append(applet) + status_applets[PublishStatus.mismatch.value].append(applet) else: - status_applets['published'].append(applet) + status_applets[PublishStatus.success.value].append(applet) for status, applets in status_applets.items(): self.publications.filter(applet__in=applets) \