From 6984b9ec2290360b36d11f4af8d1578728b0e6e2 Mon Sep 17 00:00:00 2001 From: Ivo Oskamp Date: Tue, 6 Jan 2026 12:43:38 +0100 Subject: [PATCH] Auto-commit local changes before build (2026-01-06 12:43:38) --- .last-branch | 2 +- .../src/backend/app/main/routes_api.py | 2 +- .../src/templates/main/daily_jobs.html | 19 ++++++------------- .../src/templates/main/run_checks.html | 19 ++++++------------- docs/changelog.md | 8 ++++++++ 5 files changed, 22 insertions(+), 28 deletions(-) diff --git a/.last-branch b/.last-branch index a001756..f1be705 100644 --- a/.last-branch +++ b/.last-branch @@ -1 +1 @@ -v20260106-10-fix-remarks-indent-bad-gateway +v20260106-11-new-ticket-remove-description diff --git a/containers/backupchecks/src/backend/app/main/routes_api.py b/containers/backupchecks/src/backend/app/main/routes_api.py index fd3ad03..393d3ca 100644 --- a/containers/backupchecks/src/backend/app/main/routes_api.py +++ b/containers/backupchecks/src/backend/app/main/routes_api.py @@ -179,7 +179,7 @@ def api_tickets(): return jsonify({"status": "error", "message": "Forbidden."}), 403 payload = request.get_json(silent=True) or {} - description = (payload.get("description") or "").strip() or None + description = None # Description removed from New ticket UI; use remarks for additional context try: run_id = int(payload.get("job_run_id") or 0) except Exception: diff --git a/containers/backupchecks/src/templates/main/daily_jobs.html b/containers/backupchecks/src/templates/main/daily_jobs.html index 38456d9..786a20b 100644 --- a/containers/backupchecks/src/templates/main/daily_jobs.html +++ b/containers/backupchecks/src/templates/main/daily_jobs.html @@ -202,10 +202,7 @@
-
- -
-
+
@@ -532,8 +529,7 @@ var btnTicket = document.getElementById('dj_ticket_save'); var btnRemark = document.getElementById('dj_remark_save'); var tCode = document.getElementById('dj_ticket_code'); - var tDesc = document.getElementById('dj_ticket_description'); - var tStatus = document.getElementById('dj_ticket_status'); +var tStatus = document.getElementById('dj_ticket_status'); var rBody = document.getElementById('dj_remark_body'); var rStatus = document.getElementById('dj_remark_status'); @@ -546,8 +542,7 @@ if (btnTicket) btnTicket.disabled = disabled; if (btnRemark) btnRemark.disabled = disabled; if (tCode) tCode.disabled = disabled; - if (tDesc) tDesc.disabled = disabled; - if (rBody) rBody.disabled = disabled; +if (rBody) rBody.disabled = disabled; } window.__djSetCreateDisabled = setDisabled; @@ -558,8 +553,7 @@ if (!currentRunId) { alert('Select a run first.'); return; } clearStatus(); var ticket_code = tCode ? (tCode.value || '').trim().toUpperCase() : ''; - var description = tDesc ? tDesc.value : ''; - if (!ticket_code) { +if (!ticket_code) { if (tStatus) tStatus.textContent = 'Ticket number is required.'; else alert('Ticket number is required.'); return; @@ -572,12 +566,11 @@ if (tStatus) tStatus.textContent = 'Saving...'; apiJson('/api/tickets', { method: 'POST', - body: JSON.stringify({job_run_id: currentRunId, ticket_code: ticket_code, description: description}) + body: JSON.stringify({job_run_id: currentRunId, ticket_code: ticket_code}) }) .then(function () { if (tCode) tCode.value = ''; - if (tDesc) tDesc.value = ''; - if (tStatus) tStatus.textContent = ''; +if (tStatus) tStatus.textContent = ''; loadAlerts(currentRunId); }) .catch(function (e) { diff --git a/containers/backupchecks/src/templates/main/run_checks.html b/containers/backupchecks/src/templates/main/run_checks.html index 21c1a0d..8458c4c 100644 --- a/containers/backupchecks/src/templates/main/run_checks.html +++ b/containers/backupchecks/src/templates/main/run_checks.html @@ -207,10 +207,7 @@
-
- -
-
+
@@ -829,8 +826,7 @@ table.addEventListener('change', function (e) { var btnTicket = document.getElementById('rcm_ticket_save'); var btnRemark = document.getElementById('rcm_remark_save'); var tCode = document.getElementById('rcm_ticket_code'); - var tDesc = document.getElementById('rcm_ticket_description'); - var tStatus = document.getElementById('rcm_ticket_status'); +var tStatus = document.getElementById('rcm_ticket_status'); var rBody = document.getElementById('rcm_remark_body'); var rStatus = document.getElementById('rcm_remark_status'); @@ -843,8 +839,7 @@ table.addEventListener('change', function (e) { if (btnTicket) btnTicket.disabled = disabled; if (btnRemark) btnRemark.disabled = disabled; if (tCode) tCode.disabled = disabled; - if (tDesc) tDesc.disabled = disabled; - if (rBody) rBody.disabled = disabled; +if (rBody) rBody.disabled = disabled; } window.__rcmSetCreateDisabled = setDisabled; @@ -855,8 +850,7 @@ table.addEventListener('change', function (e) { if (!currentRunId) { alert('Select a run first.'); return; } clearStatus(); var ticket_code = tCode ? (tCode.value || '').trim().toUpperCase() : ''; - var description = tDesc ? tDesc.value : ''; - if (!ticket_code) { +if (!ticket_code) { if (tStatus) tStatus.textContent = 'Ticket number is required.'; else alert('Ticket number is required.'); return; @@ -869,12 +863,11 @@ table.addEventListener('change', function (e) { if (tStatus) tStatus.textContent = 'Saving...'; apiJson('/api/tickets', { method: 'POST', - body: JSON.stringify({job_run_id: currentRunId, ticket_code: ticket_code, description: description}) + body: JSON.stringify({job_run_id: currentRunId, ticket_code: ticket_code}) }) .then(function () { if (tCode) tCode.value = ''; - if (tDesc) tDesc.value = ''; - if (tStatus) tStatus.textContent = ''; +if (tStatus) tStatus.textContent = ''; loadAlerts(currentRunId); }) .catch(function (e) { diff --git a/docs/changelog.md b/docs/changelog.md index 696f3f6..1771d84 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -79,6 +79,14 @@ Fixed a Python IndentationError in the remarks detail route that caused Gunicorn to fail on startup. Removed an incorrectly indented redirect statement so the module loads correctly and prevents Bad Gateway errors. +--- + +## v20260106-11-new-ticket-remove-description + +- Removed the "Description" input from the "New ticket" form on Daily Jobs and Run Checks pages. +- Updated the ticket creation request to store only the ticket number (ticket_code) when creating a new ticket. +- Backend /api/tickets (POST) now ignores any description input during ticket creation (use remarks for additional context). + ================================================================================================================================================ ## v0.1.16