Fix: use .includes() for string checks, filter system jobs from dashboard

This commit is contained in:
2026-06-11 15:08:22 +07:00
parent bcef4deaf1
commit d690a6cb8d
2 changed files with 8 additions and 3 deletions

View File

@@ -264,11 +264,14 @@ async def _collect_instance(inst) -> dict | None:
jid = backup_to_job.get(bid, "")
if jid:
rp_per_job[jid] = rp_per_job.get(jid, 0) + count
for j in jobs_data:
for j in jobs_data:
jid = j.get("id") or j.get("Id") or ""
if jid in rp_per_job:
j["actual_restore_points"] = rp_per_job[jid]
system_jobs = ["configuration database resynchronize", "backup configuration job", "backup deletion job", "configuration backup"]
jobs_data = [j for j in jobs_data if not any(s in ((j.get("name") or "").lower()) for s in system_jobs)]
job_count = len(jobs_data)
success = sum(1 for j in jobs_data if _safe_str(j.get("result") or "").lower() in ("success", "true"))
failed = sum(1 for j in jobs_data if _safe_str(j.get("result") or "").lower() in ("failed", "error", "false"))

View File

@@ -818,11 +818,13 @@ function showError(msg) {
function strIsFalse(val) {
if (val === null || val === undefined) return false;
return String(val).toLowerCase() in ['false', 'no', '0', 'Disabled', 'disabled'];
const lower = String(val).toLowerCase();
return ['false', 'no', '0', 'disabled'].includes(lower);
}
function strIsStopped(val) {
if (val === null || val === undefined) return false;
return String(val).toLowerCase() in ['stopped', 'idle'];
const lower = String(val).toLowerCase();
return ['stopped', 'idle'].includes(lower);
}
</script>
</body>