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

[Bugfix] 修复task 列表、

pull/3796/head
ibuler 2020-03-18 19:58:08 +08:00
parent a41988d2b5
commit d0fac3f838
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ops/models/adhoc.py
View File

@ -182,6 +182,7 @@ class AdHoc(OrgModelMixin):
id=hid, adhoc=self, task=self.task, id=hid, adhoc=self, task=self.task,
task_display=str(self.task), task_display=str(self.task),
date_start=timezone.now(), date_start=timezone.now(),
hosts_amount=self.hosts.count(),
) )
execution.save() execution.save()
return execution.start() return execution.start()

5
apps/ops/serializers/adhoc.py
View File

@ -39,6 +39,7 @@ class AdHocExecutionExcludeResultSerializer(AdHocExecutionSerializer):
class TaskSerializer(serializers.ModelSerializer): class TaskSerializer(serializers.ModelSerializer):
summary = serializers.ReadOnlyField(source='history_summary')
latest_execution = AdHocExecutionExcludeResultSerializer(read_only=True) latest_execution = AdHocExecutionExcludeResultSerializer(read_only=True)
class Meta: class Meta:
@ -46,12 +47,12 @@ class TaskSerializer(serializers.ModelSerializer):
fields = [ fields = [
'id', 'name', 'interval', 'crontab', 'is_periodic', 'id', 'name', 'interval', 'crontab', 'is_periodic',
'is_deleted', 'comment', 'date_created', 'is_deleted', 'comment', 'date_created',
'date_updated', 'latest_execution', 'date_updated', 'latest_execution', 'summary',
] ]
read_only_fields = [ read_only_fields = [
'is_deleted', 'date_created', 'date_updated', 'is_deleted', 'date_created', 'date_updated',
'latest_adhoc', 'latest_execution', 'total_run_amount', 'latest_adhoc', 'latest_execution', 'total_run_amount',
'success_run_amount', 'success_run_amount', 'summary',
] ]

4
apps/ops/templates/ops/task_list.html
View File

@ -35,7 +35,7 @@ $(document).ready(function () {
$(td).html(innerHtml); $(td).html(innerHtml);
}}, }},
{targets: 2, createdCell: function (td, cellData) { {targets: 2, createdCell: function (td, cellData) {
var summary = cellData ? cellData.stat : {failed: 0, success: 0, total: 0}; var summary = cellData || {failed: 0, success: 0, total: 0};
var innerHtml = '<span class="text-danger">failed</span>/<span class="text-navy">success</span>/total'; var innerHtml = '<span class="text-danger">failed</span>/<span class="text-navy">success</span>/total';
innerHtml = innerHtml.replace('failed', summary.failed) innerHtml = innerHtml.replace('failed', summary.failed)
.replace('success', summary.success) .replace('success', summary.success)
@ -79,7 +79,7 @@ $(document).ready(function () {
ajax_url: '{% url "api-ops:task-list" %}', ajax_url: '{% url "api-ops:task-list" %}',
columns: [ columns: [
{data: "id"}, {data: "name", className: "text-left"}, {data: "id"}, {data: "name", className: "text-left"},
{data: "latest_execution", orderable: false}, {data: "summary", orderable: false},
{data: "latest_execution", orderable: false}, {data: "latest_execution", orderable: false},
{data: "latest_execution", orderable: false}, {data: "latest_execution"}, {data: "latest_execution", orderable: false}, {data: "latest_execution"},
{data: "latest_execution", orderable:false}, {data: "id", orderable: false}, {data: "latest_execution", orderable:false}, {data: "id", orderable: false},