From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v5 6/9] ui: import: improve rendering of volume names
Date: Thu, 14 Nov 2024 10:32:23 +0100 [thread overview]
Message-ID: <20241114093226.814530-23-d.csapak@proxmox.com> (raw)
In-Reply-To: <20241114093226.814530-1-d.csapak@proxmox.com>
in directory storages, we don't need the 'import/' part of the volumes,
as that is implied in dir based storages
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/Utils.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 08d88c83..97dbbae2 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1025,7 +1025,13 @@ Ext.define('PVE.Utils', {
Ext.String.leftPad(data.channel, 2, '0') +
" ID " + data.id + " LUN " + data.lun;
} else if (data.content === 'import') {
- result = data.volid.replace(/^.*?:/, '');
+ if (data.volid.match(/^.*?:import\//)) {
+ // dir-based storages
+ result = data.volid.replace(/^.*?:import\//, '');
+ } else {
+ // esxi storage
+ result = data.volid.replace(/^.*?:/, '');
+ }
} else {
result = data.volid.replace(/^.*?:(.*?\/)?/, '');
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-11-14 9:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-14 9:32 [pve-devel] [PATCH storage/qemu-server/manager v5] implement ova/ovf import for file based storages Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 01/12] copy OVF.pm from qemu-server Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 02/12] plugin: dir: implement import content type Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 03/12] plugin: dir: handle ova files for import Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 04/12] ovf: improve and simplify path checking code Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 05/12] ovf: implement parsing the ostype Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 06/12] ovf: implement parsing out firmware type Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 07/12] ovf: implement rudimentary boot order Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 08/12] ovf: implement parsing nics Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 09/12] api: allow ova upload/download Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 10/12] plugin: enable import for nfs/btrfs/cifs/cephfs/glusterfs Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 11/12] add 'import' content type to 'check_volume_access' Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH storage v5 12/12] plugin: file_size_info: don't ignore base path with whitespace Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH qemu-server v5 1/4] api: delete unused OVF.pm Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH qemu-server v5 2/4] use OVF from Storage Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH qemu-server v5 3/4] api: create: implement extracting disks when needed for import-from Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH qemu-server v5 4/4] api: create: add 'import-extraction-storage' parameter Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 1/9] ui: fix special 'import' icon for non-esxi storages Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 2/9] ui: guest import: add ova-needs-extracting warning text Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 3/9] ui: enable import content type for relevant storages Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 4/9] ui: enable upload/download/remove buttons for 'import' type storages Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 5/9] ui: disable 'import' button for non importable formats Dominik Csapak
2024-11-14 9:32 ` Dominik Csapak [this message]
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 7/9] ui: guest import: add storage selector for ova extraction storage Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 8/9] ui: guest import: change icon/text for non-esxi import storage Dominik Csapak
2024-11-14 9:32 ` [pve-devel] [PATCH manager v5 9/9] ui: import: show size for dir-based storages Dominik Csapak
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=20241114093226.814530-23-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