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 DC8B0BA38F for ; Tue, 19 Mar 2024 14:01:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BE8801F275 for ; Tue, 19 Mar 2024 14:00:37 +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, 19 Mar 2024 14:00: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 39CA946915 for ; Tue, 19 Mar 2024 14:00:33 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 19 Mar 2024 14:00:29 +0100 Message-Id: <20240319130032.2192847-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240319130032.2192847-1-d.csapak@proxmox.com> References: <20240319130032.2192847-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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 1/4] ui: guest import: fix isWindows check 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, 19 Mar 2024 13:01:08 -0000 while most of our 'windiows' ostypes start with 'win' not all of them do (wxp, wvista), so just shorten the condition to 'starts with `w`', this covers all our windows ostypes, while not including others. Signed-off-by: Dominik Csapak --- www/manager6/window/GuestImport.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/manager6/window/GuestImport.js b/www/manager6/window/GuestImport.js index 443bc886..81e9074e 100644 --- a/www/manager6/window/GuestImport.js +++ b/www/manager6/window/GuestImport.js @@ -198,7 +198,7 @@ Ext.define('PVE.window.GuestImport', { let collection = store.getData().getSource() ?? store.getData(); let rec = collection.find('autogenerated', true); - let isWindows = (value ?? '').startsWith('win'); + let isWindows = (value ?? '').startsWith('w'); if (rec) { rec.set('hidden', !isWindows); rec.commit(); @@ -275,7 +275,7 @@ Ext.define('PVE.window.GuestImport', { + get('warnings').map(w => `
  • ${w}
    • `).join('') + '', liveImportNote: get => !get('liveImport') ? '' : gettext('Note: If anything goes wrong during the live-import, new data written by the VM may be lost.'), - isWindows: get => (get('os') ?? '').startsWith('win'), + isWindows: get => (get('os') ?? '').startsWith('w'), }, }, @@ -925,7 +925,7 @@ Ext.define('PVE.window.GuestImport', { me.additionalCdIdx = additionalCdIdx; me.lookup('cdGrid').getStore().add({ enable: true, - hidden: !(me.vmConfig.ostype ?? '').startsWith('win'), + hidden: !(me.vmConfig.ostype ?? '').startsWith('w'), id: additionalCdIdx, autogenerated: true, }); -- 2.39.2