From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9B9471FF16F for <inbox@lore.proxmox.com>; Thu, 30 Jan 2025 12:32:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F242AFB97; Thu, 30 Jan 2025 12:31:58 +0100 (CET) From: Daniel Herzig <d.herzig@proxmox.com> To: pve-devel@lists.proxmox.com Date: Thu, 30 Jan 2025 12:31:21 +0100 Message-Id: <20250130113121.157273-7-d.herzig@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250130113121.157273-1-d.herzig@proxmox.com> References: <20250130113121.157273-1-d.herzig@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.580 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-manager v3 6/6] fix #4225: ui: qemu: hardware: add eject button for cdroms X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> This commit adds a button in the hardware view for quickly ejecting unnecessary cdroms or ISO files by setting file to 'none'. Signed-off-by: Daniel Herzig <d.herzig@proxmox.com> --- www/manager6/qemu/HardwareView.js | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index c6d193fc..d8a9e187 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -541,6 +541,44 @@ Ext.define('PVE.qemu.HardwareView', { apiurl: '/api2/extjs/' + baseurl, }); + let eject_btn = new Proxmox.button.Button({ + text: gettext('Eject'), + disabled: true, + selModel: sm, + RESTMethod: 'POST', + confirmMsg: function(rec) { + let confirmMessage = gettext("Are you sure you want to eject '{0}' ?"); + let isoFile = PVE.Parser.parsePropertyString(rec.data.value, 'volid').volid; + return Ext.htmlEncode(Ext.String.format(confirmMessage, isoFile)); + }, + handler: function(btn, e, rec) { + let params = {}; + params[rec.data.key] = 'none,media=cdrom'; + if (btn.RESTMethod === 'POST') { + params.background_delay = 5; + } + Proxmox.Utils.API2Request({ + url: '/api2/extjs/' + baseurl, + waitMsgTarget: me, + method: btn.RESTMethod, + params: params, + callback: () => me.reload(), + failure: response => Ext.Msg.alert('Error', response.htmlStatus), + success: function(response, options) { + if (btn.RESTMethod === 'POST' && response.result.data !== null) { + Ext.create('Proxmox.window.TaskProgress', { + autoShow: true, + upid: response.result.data, + listeners: { + destroy: () => me.reload(), + }, + }); + } + }, + }); + }, + }); + let efidisk_menuitem = Ext.create('Ext.menu.Item', { text: gettext('EFI Disk'), iconCls: 'fa fa-fw fa-hdd-o black', @@ -611,6 +649,7 @@ Ext.define('PVE.qemu.HardwareView', { edit_btn.disable(); diskaction_btn.disable(); revert_btn.disable(); + eject_btn.disable(); return; } const { key, value } = rec.data; @@ -622,6 +661,7 @@ Ext.define('PVE.qemu.HardwareView', { const isCloudInit = isCloudInitKey(value); const isCDRom = value && !!value.toString().match(/media=cdrom/); + const isEjectedCDRom = value && !!value.toString().match(/none,media=cdrom/); const isUnusedDisk = key.match(/^unused\d+/); const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom; @@ -651,6 +691,7 @@ Ext.define('PVE.qemu.HardwareView', { resize_menuitem.setDisabled(pending || !isUsedDisk); revert_btn.setDisabled(!pending); + eject_btn.setDisabled(!cdromCap || !isCDRom || isCloudInit || isEjectedCDRom); }; let editorFactory = (classPath, extraOptions) => { @@ -754,6 +795,7 @@ Ext.define('PVE.qemu.HardwareView', { remove_btn, edit_btn, diskaction_btn, + eject_btn, revert_btn, ], rows: rows, -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel