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 F0EB692368 for ; Mon, 12 Sep 2022 14:00:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EC9604663 for ; Mon, 12 Sep 2022 14:00:25 +0200 (CEST) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Mon, 12 Sep 2022 14:00:24 +0200 (CEST) Received: by lana.proxmox.com (Postfix, from userid 10043) id CB7292C1730; Mon, 12 Sep 2022 14:00:17 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Mon, 12 Sep 2022 14:00:08 +0200 Message-Id: <20220912120008.1220711-4-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220912120008.1220711-1-s.hanreich@proxmox.com> References: <20220912120008.1220711-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager v2 1/1] fix #4228: ui: Add checkbox to rollback dialog for automatically restarting VM/CT 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: Mon, 12 Sep 2022 12:00:26 -0000 Signed-off-by: Stefan Hanreich --- I've added a custom Window containing the dialog, since using MessageBox for this seemed a bit tricky. Maybe I could move the definition of the components outside the handler and only instantiate them there? I thought it was fine for now, since the Window is specific to the SnapshotTree anyway. www/manager6/tree/SnapshotTree.js | 62 +++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/www/manager6/tree/SnapshotTree.js b/www/manager6/tree/SnapshotTree.js index 97268072..a6f25f19 100644 --- a/www/manager6/tree/SnapshotTree.js +++ b/www/manager6/tree/SnapshotTree.js @@ -61,7 +61,9 @@ Ext.define('PVE.guest.SnapshotTree', { me.mon(win, 'destroy', me.reload, me); }, - snapshotAction: function(action, method) { + snapshotAction: function(action, method, params) { + params = params || {}; + let me = this; let view = me.getView(); let vm = me.getViewModel(); @@ -75,6 +77,7 @@ Ext.define('PVE.guest.SnapshotTree', { Proxmox.Utils.API2Request({ url: `/nodes/${nodename}/${type}/${vmid}/snapshot/${snapname}/${action}`, method: method, + params: params, waitMsgTarget: view, callback: function() { me.reload(); @@ -89,9 +92,8 @@ Ext.define('PVE.guest.SnapshotTree', { }, }); }, - - rollback: function() { - this.snapshotAction('rollback', 'POST'); + rollback: function(params) { + this.snapshotAction('rollback', 'POST', params); }, remove: function() { this.snapshotAction('', 'DELETE'); @@ -255,14 +257,60 @@ Ext.define('PVE.guest.SnapshotTree', { bind: { disabled: '{!canRollback}', }, - confirmMsg: function() { + handler: function() { let view = this.up('treepanel'); + let rec = view.getSelection()[0]; let vmid = view.getViewModel().get('vmid'); - return Proxmox.Utils.format_task_description('qmrollback', vmid) + + let label = Proxmox.Utils.format_task_description('qmrollback', vmid) + ` '${rec.data.name}'? ${gettext("Current state will be lost.")}`; + + let formPanel = Ext.create({ + xtype: 'inputpanel', + bodyPadding: 10, + border: false, + items: [ + { + xtype: 'label', + html: label, + }, + { + xtype: 'proxmoxcheckbox', + name: 'start', + margin: '5 0 0 0', + boxLabel: gettext('Start guest after rollback'), + }, + ], + }); + + let win = Ext.create("Ext.window.Window", { + width: 400, + layout: 'fit', + title: gettext('Confirm'), + closable: true, + resizable: false, + modal: true, + buttons: [ + { + text: 'Yes', + handler: function() { + view.controller.rollback(formPanel.getValues()); + win.close(); + }, + }, + { + text: 'No', + handler: function() { + win.close(); + }, + }, + ], + buttonAlign: 'center', + items: [formPanel], + }); + + win.show(); }, - handler: 'rollback', }, '-', { -- 2.30.2