]> git.proxmox.com Git - pve-manager.git/commitdiff
fix #4328: ui: add widget toolkit to dependencies of OnlineHelpInfo.js
authorStefan Sterz <s.sterz@proxmox.com>
Mon, 14 Nov 2022 11:38:28 +0000 (12:38 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Mon, 14 Nov 2022 18:51:00 +0000 (19:51 +0100)
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
www/manager6/Makefile

index 3eee0fdbb88f086f555d0234b262142457a0ee6c..6da9a0dd826f0b0dc29f1ed82808de120eba9605 100644 (file)
@@ -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),
index 5938c7f5c21e3b875b313d87f24fbde7b52439f7..2802cbacde7fe6b75a96ad6364fb774e3334deb5 100644 (file)
@@ -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