From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 62F0820EC95 for ; Mon, 29 Apr 2024 13:30:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 41874E68C; Mon, 29 Apr 2024 13:30:10 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 29 Apr 2024 13:21:21 +0200 Message-Id: <20240429112124.3819357-21-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240429112124.3819357-1-d.csapak@proxmox.com> References: <20240429112124.3819357-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 Subject: [pve-devel] [PATCH manager v3 6/9] ui: import: improve rendering of volume names 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 --- 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 ff2fae25..ea6e30e8 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1024,7 +1024,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.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel