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 725956904A for ; Mon, 1 Mar 2021 15:12:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5EB5921177 for ; Mon, 1 Mar 2021 15:12:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id AAC642112A for ; Mon, 1 Mar 2021 15:12:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6E4E845837 for ; Mon, 1 Mar 2021 15:12:47 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 1 Mar 2021 15:12:22 +0100 Message-Id: <20210301141225.18394-6-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210301141225.18394-1-s.ivanov@proxmox.com> References: <20210301141225.18394-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-gui v2 2/4] backup: fix #3154: make statistic backup optional X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2021 14:12:49 -0000 by creating an edit-window when clicking on the respective Backup now button. This is the second part of the enhancement request Signed-off-by: Stoiko Ivanov --- js/BackupRestore.js | 45 ++++++++++++++++++++++++++++--------------- js/PBSSnapshotView.js | 19 +++--------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/js/BackupRestore.js b/js/BackupRestore.js index 3cfabd8..21a979f 100644 --- a/js/BackupRestore.js +++ b/js/BackupRestore.js @@ -69,6 +69,32 @@ Ext.define('PMG.RestoreWindow', { }, }); +Ext.define('PMG.BackupWindow', { + extend: 'Proxmox.window.Edit', + xtype: 'pmgBackupWindow', + onlineHelp: 'chapter_pmgbackup', + + showProgress: true, + title: gettext('Backup'), + isCreate: true, + method: 'POST', + submitText: gettext('Backup'), + fieldDefaults: { + labelWidth: 150, + }, + showTaskViewer: true, + items: [ + { + xtype: 'proxmoxcheckbox', + name: 'statistic', + value: 1, + uncheckedValue: 0, + fieldLabel: gettext('Include Statistics'), + }, + ], + +}); + Ext.define('PMG.BackupRestore', { extend: 'Ext.grid.GridPanel', xtype: 'pmgBackupRestore', @@ -80,23 +106,10 @@ Ext.define('PMG.BackupRestore', { createBackup: function() { let view = this.getView(); - Proxmox.Utils.API2Request({ + Ext.create('PMG.BackupWindow', { url: "/nodes/" + Proxmox.NodeName + "/backup", - method: 'POST', - waitMsgTarget: view, - failure: function(response, opts) { - Ext.Msg.alert(gettext('Error'), response.htmlStatus); - }, - success: function(response, opts) { - let upid = response.result.data; - - let win = Ext.create('Proxmox.window.TaskViewer', { - upid: upid, - autoShow: true, - }); - view.mon(win, 'close', () => view.store.load()); - }, - }); + taskDone: () => view.store.load(), + }).show(); }, onRestore: function() { diff --git a/js/PBSSnapshotView.js b/js/PBSSnapshotView.js index 841bff8..c182bfb 100644 --- a/js/PBSSnapshotView.js +++ b/js/PBSSnapshotView.js @@ -25,23 +25,10 @@ Ext.define('PMG.PBSConfig', { let me = this; let view = me.lookup('snapshotsGrid'); let remote = me.getViewModel().get('remote'); - Proxmox.Utils.API2Request({ + Ext.create('PMG.BackupWindow', { url: `/nodes/${Proxmox.NodeName}/pbs/${remote}/snapshot`, - method: 'POST', - waitMsgTarget: view, - failure: function(response, opts) { - Ext.Msg.alert(gettext('Error'), response.htmlStatus); - }, - success: function(response, opts) { - let upid = response.result.data; - - let win = Ext.create('Proxmox.window.TaskViewer', { - upid: upid, - }); - win.show(); - me.mon(win, 'close', function() { view.getStore().load(); }); - }, - }); + taskDone: () => view.getStore().load(), + }).show(); }, reload: function(grid) { -- 2.20.1