From dd6de395dc93e9f00c5317ae37f208536f7fb019 Mon Sep 17 00:00:00 2001 From: Stefan Sterz Date: Mon, 14 Nov 2022 12:38:28 +0100 Subject: [PATCH] fix #4328: ui: add widget toolkit to dependencies of OnlineHelpInfo.js previously the widget toolkit was not scanned when creating the mapping between `onlineHelp` keys and pve-doc anchors. this could lead to cases where help buttons didn't work because the necessary mapping wasn't present in `OnlineHelpInfo.js`. Signed-off-by: Stefan Sterz --- debian/control | 1 + www/manager6/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 3eee0fdb..6da9a0dd 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Build-Depends: debhelper (>= 12~), libtemplate-perl, libtest-mockmodule-perl, lintian, + proxmox-widget-toolkit (>= 3.4-9), pve-cluster, pve-container, pve-doc-generator (>= 7.0-4), diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 5938c7f5..2802cbac 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -288,6 +288,8 @@ JSSRC= \ Workspace.js \ # end of JSSRC list +WIDGETKIT=/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js + all: .lint-incremental: ${JSSRC} @@ -304,8 +306,8 @@ pvemanagerlib.js: .lint-incremental OnlineHelpInfo.js ${JSSRC} cat OnlineHelpInfo.js ${JSSRC} >$@.tmp mv $@.tmp $@ -OnlineHelpInfo.js: /usr/bin/asciidoc-pve ${JSSRC} - /usr/bin/asciidoc-pve scan-extjs ${JSSRC} >$@.tmp +OnlineHelpInfo.js: ${JSSRC} ${WIDGETKIT} + /usr/bin/asciidoc-pve scan-extjs $^ >$@.tmp mv $@.tmp $@ .PHONY: install