From: Stefan Sterz <s.sterz@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v3 2/2] fix #4328: ui: add widget toolkit to dependencies of OnlineHelpInfo.js
Date: Mon, 14 Nov 2022 12:38:28 +0100 [thread overview]
Message-ID: <20221114113828.286081-3-s.sterz@proxmox.com> (raw)
In-Reply-To: <20221114113828.286081-1-s.sterz@proxmox.com>
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 <s.sterz@proxmox.com>
---
debian/control | 1 +
www/manager6/Makefile | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 35c9eee3..712d65e8 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
--
2.30.2
next prev parent reply other threads:[~2022-11-14 11:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-14 11:38 [pve-devel] [PATCH manager v3 0/2] pve fix help buttons by accounting for keys in widget toolkit Stefan Sterz
2022-11-14 11:38 ` [pve-devel] [PATCH docs v3 1/2] asciidoc-pve: disallow certain characters in onlineHelp keys Stefan Sterz
2022-11-14 18:50 ` [pve-devel] applied: " Thomas Lamprecht
2022-11-14 11:38 ` Stefan Sterz [this message]
2022-11-14 19:48 ` [pve-devel] applied: [PATCH manager v3 2/2] fix #4328: ui: add widget toolkit to dependencies of OnlineHelpInfo.js Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221114113828.286081-3-s.sterz@proxmox.com \
--to=s.sterz@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.