github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-25 14:50:24 +00:00
Code Issues Projects Releases Wiki Activity

增加部分翻译

Browse Source
This commit is contained in:
Aaron3S
2022-12-16 18:39:59 +08:00
parent 362cfb733c
commit 54f720e992
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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',
'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"
]