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 76DBB6AFBE for ; Mon, 8 Mar 2021 11:02:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7507A1CBD4 for ; Mon, 8 Mar 2021 11:02:02 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 7CAE81CBB9 for ; Mon, 8 Mar 2021 11:02:01 +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 4066C41DA6 for ; Mon, 8 Mar 2021 11:02:01 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Mon, 8 Mar 2021 11:01:50 +0100 Message-Id: <20210308100151.7886-4-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210308100151.7886-1-s.reiter@proxmox.com> References: <20210308100151.7886-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.024 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 4/5] Utils: add is_windows and use in MachineEdit 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: Mon, 08 Mar 2021 10:02:02 -0000 A bit more future proof and reuseable than a regex match. Signed-off-by: Stefan Reiter --- www/manager6/Utils.js | 9 +++++++++ www/manager6/qemu/MachineEdit.js | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index ab4988b0..f502950f 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -69,6 +69,15 @@ Ext.define('PVE.Utils', { ], }, + is_windows: function(ostype) { + for (let entry of PVE.Utils.kvm_ostypes['Microsoft Windows']) { + if (entry.val === ostype) { + return true; + } + } + return false; + }, + get_health_icon: function(state, circle) { if (circle === undefined) { circle = false; diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js index 87b405f5..f928c80c 100644 --- a/www/manager6/qemu/MachineEdit.js +++ b/www/manager6/qemu/MachineEdit.js @@ -138,9 +138,7 @@ Ext.define('PVE.qemu.MachineEdit', { let values = { machine: conf.machine || '__default__', }; - if (conf.ostype && conf.ostype.match(/^(win|wvista|wxp|w2k)/i)) { - values.isWindows = true; - } + values.isWindows = PVE.Utils.is_windows(conf.ostype); me.setValues(values); }, }); -- 2.20.1