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 BA5CD7D71C for ; Tue, 9 Nov 2021 12:27:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D2B1FB043 for ; Tue, 9 Nov 2021 12:27:29 +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 id 3BA17AFAC for ; Tue, 9 Nov 2021 12:27:26 +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 10DFE469AE for ; Tue, 9 Nov 2021 12:27:26 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 9 Nov 2021 12:27:08 +0100 Message-Id: <20211109112721.130935-20-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109112721.130935-1-w.bumiller@proxmox.com> References: <20211109112721.130935-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.526 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 1/7] www: use render_u2f_error from wtk 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, 09 Nov 2021 11:27:53 -0000 Signed-off-by: Wolfgang Bumiller --- www/manager6/Utils.js | 11 ----------- www/manager6/dc/TFAEdit.js | 2 +- www/manager6/window/LoginWindow.js | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 274d4db2..c907eecf 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1302,17 +1302,6 @@ Ext.define('PVE.Utils', { return Ext.htmlEncode(first + " " + last); }, - render_u2f_error: function(error) { - var ErrorNames = { - '1': gettext('Other Error'), - '2': gettext('Bad Request'), - '3': gettext('Configuration Unsupported'), - '4': gettext('Device Ineligible'), - '5': gettext('Timeout'), - }; - return "U2F Error: " + ErrorNames[error] || Proxmox.Utils.unknownText; - }, - windowHostname: function() { return window.location.hostname.replace(Proxmox.Utils.IP6_bracket_match, function(m, addr, offset, original) { return addr; }); diff --git a/www/manager6/dc/TFAEdit.js b/www/manager6/dc/TFAEdit.js index 54e8d87f..57a73b39 100644 --- a/www/manager6/dc/TFAEdit.js +++ b/www/manager6/dc/TFAEdit.js @@ -44,7 +44,7 @@ Ext.define('PVE.window.TFAEdit', { showError: function(error) { Ext.Msg.alert( gettext('Error'), - PVE.Utils.render_u2f_error(error), + Proxmox.Utils.render_u2f_error(error), ); }, diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js index 2f23cbb5..ecd198a5 100644 --- a/www/manager6/window/LoginWindow.js +++ b/www/manager6/window/LoginWindow.js @@ -151,7 +151,7 @@ Ext.define('PVE.window.LoginWindow', { msg.close(); if (res.errorCode) { Proxmox.Utils.authClear(); - Ext.Msg.alert(gettext('Error'), PVE.Utils.render_u2f_error(res.errorCode)); + Ext.Msg.alert(gettext('Error'), Proxmox.Utils.render_u2f_error(res.errorCode)); return; } delete res.errorCode; -- 2.30.2