From 29be81f1be7cbfb5f03afaf1f59782604a2216c4 Mon Sep 17 00:00:00 2001 From: kisfenyo Date: Mon, 16 Feb 2026 16:28:41 +0100 Subject: [PATCH] fix: require_arg for --hdd-path, explicit event in stackAction, title separator, nextPruneLabel Sunday edge case Co-Authored-By: Claude Opus 4.6 --- controller/internal/web/funcmap.go | 8 ++++++-- controller/internal/web/templates/dashboard.html | 8 ++++---- controller/internal/web/templates/layout.html | 4 ++-- controller/internal/web/templates/stacks.html | 10 +++++----- scripts/docker-setup.sh | 4 +++- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/controller/internal/web/funcmap.go b/controller/internal/web/funcmap.go index 8d55ff5..623848a 100644 --- a/controller/internal/web/funcmap.go +++ b/controller/internal/web/funcmap.go @@ -246,8 +246,12 @@ func (s *Server) templateFuncMap() template.FuncMap { next = now.Add(24 * time.Hour) default: // weekly/sunday daysUntilSunday := (7 - int(now.Weekday())) % 7 - if daysUntilSunday == 0 && now.Hour() >= 4 { - daysUntilSunday = 7 + if daysUntilSunday == 0 { + if now.Hour() >= 4 { + daysUntilSunday = 7 // Already ran today, next week + } else { + return "ma" // Today (Sunday), hasn't run yet + } } next = now.AddDate(0, 0, daysUntilSunday) } diff --git a/controller/internal/web/templates/dashboard.html b/controller/internal/web/templates/dashboard.html index 2e4c8a6..83f0add 100644 --- a/controller/internal/web/templates/dashboard.html +++ b/controller/internal/web/templates/dashboard.html @@ -140,16 +140,16 @@ {{if .Protected}} Védett {{if isOperational .State}} - + {{end}} {{else if not .Deployed}} Telepítés {{else}} {{if isOperational .State}} - - + + {{else}} - + {{end}} Napló {{if .Orphaned}}{{end}} diff --git a/controller/internal/web/templates/layout.html b/controller/internal/web/templates/layout.html index 24a64e3..ccfd40b 100644 --- a/controller/internal/web/templates/layout.html +++ b/controller/internal/web/templates/layout.html @@ -4,7 +4,7 @@ - {{.Title}}Felhom.eu + {{.Title}} — Felhom.eu @@ -83,7 +83,7 @@ btn.disabled = false; btn.classList.remove('loading'); } - async function stackAction(name, action) { + async function stackAction(event, name, action) { const btn = event.currentTarget; const origText = btn.textContent; btn.disabled = true; diff --git a/controller/internal/web/templates/stacks.html b/controller/internal/web/templates/stacks.html index c259a29..edbffd6 100644 --- a/controller/internal/web/templates/stacks.html +++ b/controller/internal/web/templates/stacks.html @@ -60,7 +60,7 @@ {{if .Protected}} Védett rendszerkomponens {{if isOperational .State}} - + {{end}} {{if .Meta.Slug}} Részletek @@ -70,11 +70,11 @@ Részletek {{else}} {{if isOperational .State}} - {{if not .Orphaned}}{{end}} - - + {{if not .Orphaned}}{{end}} + + {{else}} - + {{end}} Naplók {{if not .Orphaned}}Részletek{{end}} diff --git a/scripts/docker-setup.sh b/scripts/docker-setup.sh index 88817b1..355363c 100644 --- a/scripts/docker-setup.sh +++ b/scripts/docker-setup.sh @@ -312,7 +312,9 @@ parse_args() { CUSTOMER_ID="$2"; shift 2 ;; --self-signed-cert) SELF_SIGNED_CERT=true; shift ;; --skip-filebrowser) SKIP_FILEBROWSER=true; shift ;; - --hdd-path) HDD_PATH="$2"; shift 2 ;; + --hdd-path) + require_arg "$1" "${2:-}" + HDD_PATH="$2"; shift 2 ;; --dry-run) DRY_RUN=true; shift ;; --debug) DEBUG_MODE=true; shift ;; -h|--help) print_help; exit 0 ;;