From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/4] ui: guest import: fix isWindows check
Date: Tue, 19 Mar 2024 14:00:29 +0100 [thread overview]
Message-ID: <20240319130032.2192847-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240319130032.2192847-1-d.csapak@proxmox.com>
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 <d.csapak@proxmox.com>
---
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 => `<li>${w}</li>`).join('') + '</ul>',
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
next prev parent reply other threads:[~2024-03-19 13:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 13:00 [pve-devel] [PATCH storage/manager] guest import improvements Dominik Csapak
2024-03-19 13:00 ` [pve-devel] [PATCH storage 1/2] esxi: add warning for losing efi state Dominik Csapak
2024-03-19 17:12 ` [pve-devel] applied: " Thomas Lamprecht
2024-03-19 13:00 ` [pve-devel] [PATCH storage 2/2] esxi: only add scsihw if it's defined Dominik Csapak
2024-03-19 17:12 ` [pve-devel] applied: " Thomas Lamprecht
2024-03-19 13:00 ` Dominik Csapak [this message]
2024-03-19 13:00 ` [pve-devel] [PATCH manager 2/4] ui: guest import: auto activate virtio preparation for win + ovmf Dominik Csapak
2024-03-19 13:00 ` [pve-devel] [PATCH manager 3/4] ui: guest import: correctly set default scsihw value Dominik Csapak
2024-03-19 13:00 ` [pve-devel] [PATCH manager 4/4] ui: guest import: add warning for losing efi state Dominik Csapak
2024-03-19 17:18 ` [pve-devel] applied: [PATCH storage/manager] guest import improvements Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240319130032.2192847-4-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox