From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B90EC8E58E for ; Fri, 11 Nov 2022 16:05:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A2E29552D for ; Fri, 11 Nov 2022 16:05:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 11 Nov 2022 16:05:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DDADC40675 for ; Fri, 11 Nov 2022 16:05:36 +0100 (CET) From: Stefan Sterz To: pve-devel@lists.proxmox.com Date: Fri, 11 Nov 2022 16:05:27 +0100 Message-Id: <20221111150527.538248-4-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221111150527.538248-1-s.sterz@proxmox.com> References: <20221111150527.538248-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.104 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager v2 1/1] fix #4328: ui: add widget toolkit to dependencies of OnlineHelpInfo.js X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2022 15:05:38 -0000 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 --- i took the liberty here to remove "/usr/bin/asciidoc-pve" as a prerequisite of the affected make target. imo it isn't prerequisite any more than "eslint" is for the `lint` target. it should already be handled by the build dependencies anyway afaiu. if that's not correct, i'll send a v3. 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