github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

增加部分翻译

pull/9223/head
Aaron3S 2022-12-16 18:39:59 +08:00
parent 362cfb733c
commit 54f720e992
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/locale/zh/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9f0b10566b4d35accd3a8766b14d6903243d93c5d7c55b208d930a189e590f2f oid sha256:eaeedc4823f9b7e236b36a169b5587ef5988d3c3e529d6cbede6bae5e2b57ab8
size 106125 size 106349

8
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -3067,19 +3067,19 @@ msgstr "跳过"
#: ops/models/job.py:39 #: ops/models/job.py:39
msgid "Chdir" msgid "Chdir"
msgstr "" msgstr "运行目录"
#: ops/models/job.py:40 #: ops/models/job.py:40
msgid "Timeout (Seconds)" msgid "Timeout (Seconds)"
msgstr "" msgstr "超市时间（秒）"
#: ops/models/job.py:45 #: ops/models/job.py:45
msgid "Runas" msgid "Runas"
msgstr "" msgstr "运行用户"
#: ops/models/job.py:47 #: ops/models/job.py:47
msgid "Runas policy" msgid "Runas policy"
msgstr "" msgstr "用户策略"
#: ops/models/job.py:48 #: ops/models/job.py:48
msgid "Use Parameter Define" msgid "Use Parameter Define"

4
apps/ops/models/job.py
View File

@ -104,7 +104,7 @@ class JobExecution(JMSOrgBaseModel):
return { return {
"ok": len(self.summary['ok']), "ok": len(self.summary['ok']),
"failed": len(self.summary['failures']) + len(self.summary['dark']), "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() "total": self.job.assets.count()
} }
@ -121,7 +121,7 @@ class JobExecution(JMSOrgBaseModel):
"status": "ok", "status": "ok",
"tasks": [], "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"}) asset_detail.update({"status": "excludes"})
result["detail"].append(asset_detail) result["detail"].append(asset_detail)
break break

7
apps/ops/serializers/job.py
View File

@ -37,10 +37,7 @@ class JobExecutionSerializer(BulkOrgResourceModelSerializer):
read_only_fields = ["id", "task_id", "timedelta", "count", "time_cost", 'is_finished', 'date_start', read_only_fields = ["id", "task_id", "timedelta", "count", "time_cost", 'is_finished', 'date_start',
'date_finished', 'date_finished',
'date_created', 'date_created',
'is_success', 'task_id', 'short_id', 'job_type', 'creator'] 'is_success', 'task_id', 'short_id', 'job_type']
fields = read_only_fields + [ fields = read_only_fields + [
"job", "parameters" "job", "parameters", "creator"
] ]