diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 1318974aa..724ba67ff 100644 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f0b10566b4d35accd3a8766b14d6903243d93c5d7c55b208d930a189e590f2f -size 106125 +oid sha256:eaeedc4823f9b7e236b36a169b5587ef5988d3c3e529d6cbede6bae5e2b57ab8 +size 106349 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index fa1799a13..256794ea4 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -3067,19 +3067,19 @@ msgstr "跳过" #: ops/models/job.py:39 msgid "Chdir" -msgstr "" +msgstr "运行目录" #: ops/models/job.py:40 msgid "Timeout (Seconds)" -msgstr "" +msgstr "超市时间(秒)" #: ops/models/job.py:45 msgid "Runas" -msgstr "" +msgstr "运行用户" #: ops/models/job.py:47 msgid "Runas policy" -msgstr "" +msgstr "用户策略" #: ops/models/job.py:48 msgid "Use Parameter Define" diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index d9a4bdc58..d8a70d55e 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -104,7 +104,7 @@ class JobExecution(JMSOrgBaseModel): return { "ok": len(self.summary['ok']), "failed": len(self.summary['failures']) + len(self.summary['dark']), - "excludes": len(self.summary['excludes']), + "excludes": len(self.summary.get('excludes', {})), "total": self.job.assets.count() } @@ -121,7 +121,7 @@ class JobExecution(JMSOrgBaseModel): "status": "ok", "tasks": [], } - if self.summary["excludes"].get(asset.name, None): + if self.summary.get("excludes", None) and self.summary["excludes"].get(asset.name, None): asset_detail.update({"status": "excludes"}) result["detail"].append(asset_detail) break diff --git a/apps/ops/serializers/job.py b/apps/ops/serializers/job.py index e56fca583..81f77b915 100644 --- a/apps/ops/serializers/job.py +++ b/apps/ops/serializers/job.py @@ -37,10 +37,7 @@ class JobExecutionSerializer(BulkOrgResourceModelSerializer): read_only_fields = ["id", "task_id", "timedelta", "count", "time_cost", 'is_finished', 'date_start', 'date_finished', 'date_created', - 'is_success', 'task_id', 'short_id', 'job_type', 'creator'] + 'is_success', 'task_id', 'short_id', 'job_type'] fields = read_only_fields + [ - "job", "parameters" + "job", "parameters", "creator" ] - - -