diff --git a/ajax.php b/ajax.php index fa33431..b817952 100644 --- a/ajax.php +++ b/ajax.php @@ -107,7 +107,6 @@ switch ($action) { $task = new CRObject(); $task->set('job', cr_get_GET('job')); $task->set('task', cr_get_GET('task')); - $task->set('task', 'node1'); $res = task_logs($task); break; diff --git a/static/job.js b/static/job.js index dff9611..fc6d89f 100755 --- a/static/job.js +++ b/static/job.js @@ -229,7 +229,7 @@ function jobOperateFormatter(value, row, index) { div += ''; if (page_type === 'jobs') div += ''; - if (page_type === 'jobs' && (parseInt(row.status) === 0 || parseInt(row.status) === 1)) + if (page_type === 'jobs' && (parseInt(row.status) !== 3 && parseInt(row.status) !== 4)) div += ''; div += ''; return div; @@ -296,7 +296,8 @@ function load_job_status(name) { field: 'id', title: 'ID', align: 'center', - valign: 'middle' + valign: 'middle', + visible: false }, { field: 'image', title: 'Image',