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 ABAFA9E363 for ; Tue, 31 Oct 2023 10:05:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 825BB186D2 for ; Tue, 31 Oct 2023 10:05:34 +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 ; Tue, 31 Oct 2023 10:05:33 +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 1EC6942D34 for ; Tue, 31 Oct 2023 10:05:33 +0100 (CET) From: Folke Gleumes To: pve-devel@lists.proxmox.com Date: Tue, 31 Oct 2023 10:05:14 +0100 Message-Id: <20231031090514.23629-6-f.gleumes@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031090514.23629-1-f.gleumes@proxmox.com> References: <20231031090514.23629-1-f.gleumes@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager v3 5/5] ui/acme: switch to new meta endpoint 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: Tue, 31 Oct 2023 09:05:34 -0000 Besides the switch from tos to meta endpoint, this fixes a visual bug, where the 'Accept TOS' button would show up, even if no ToS was needed. Signed-off-by: Folke Gleumes --- Changes since v2: fixed tabs/spaces www/manager6/node/ACME.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/www/manager6/node/ACME.js b/www/manager6/node/ACME.js index 9f1dabce..21137b1a 100644 --- a/www/manager6/node/ACME.js +++ b/www/manager6/node/ACME.js @@ -79,15 +79,19 @@ Ext.define('PVE.node.ACMEAccountCreate', { checkbox.setHidden(true); Proxmox.Utils.API2Request({ - url: '/cluster/acme/tos', + url: '/cluster/acme/meta', method: 'GET', params: { directory: value, }, success: function(response, opt) { - field.setValue(response.result.data); - disp.setValue(response.result.data); - checkbox.setHidden(false); + if (response.result.data.termsOfService) { + field.setValue(response.result.data.termsOfService); + disp.setValue(response.result.data.termsOfService); + checkbox.setHidden(false); + } else { + disp.setValue(undefined); + } }, failure: function(response, opt) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); -- 2.39.2