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 8533663D58 for ; Wed, 28 Oct 2020 19:55:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3B88322AC4 for ; Wed, 28 Oct 2020 19:54:53 +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 03732229E8 for ; Wed, 28 Oct 2020 19:54:49 +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 BE14145F7E for ; Wed, 28 Oct 2020 19:54:48 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@pve.proxmox.com Date: Wed, 28 Oct 2020 19:54:31 +0100 Message-Id: <20201028185432.23067-16-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028185432.23067-1-s.ivanov@proxmox.com> References: <20201028185432.23067-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.091 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 2/3] refactor RestoreWindow for PBS 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: Wed, 28 Oct 2020 18:55:26 -0000 by moving the item definition to initComponent, and changing the check for a provided filename, we can reuse the window for restores from PBS Signed-off-by: Stoiko Ivanov --- js/BackupRestore.js | 59 +++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/js/BackupRestore.js b/js/BackupRestore.js index 6c97230..996f128 100644 --- a/js/BackupRestore.js +++ b/js/BackupRestore.js @@ -26,40 +26,41 @@ Ext.define('PMG.RestoreWindow', { fieldDefaults: { labelWidth: 150, }, - items: [ - { - xtype: 'proxmoxcheckbox', - name: 'config', - fieldLabel: gettext('System Configuration'), - }, - { - xtype: 'proxmoxcheckbox', - name: 'database', - value: 1, - uncheckedValue: 0, - fieldLabel: gettext('Rule Database'), - listeners: { - change: function(cb, value) { - var me = this; - me.up().down('field[name=statistic]').setDisabled(!value); - }, - }, - }, - { - xtype: 'proxmoxcheckbox', - name: 'statistic', - fieldLabel: gettext('Statistic'), - }, - ], initComponent: function() { var me = this; - if (!me.filename) { - throw "no filename given"; - } + me.items = [ + { + xtype: 'proxmoxcheckbox', + name: 'config', + fieldLabel: gettext('System Configuration'), + }, + { + xtype: 'proxmoxcheckbox', + name: 'database', + value: 1, + uncheckedValue: 0, + fieldLabel: gettext('Rule Database'), + listeners: { + change: function(cb, value) { + me.up().down('field[name=statistic]').setDisabled(!value); + }, + }, + }, + { + xtype: 'proxmoxcheckbox', + name: 'statistic', + fieldLabel: gettext('Statistic'), + }, + ]; - me.url = "/nodes/" + Proxmox.NodeName + "/backup/" + encodeURIComponent(me.filename); + let initurl = "/nodes/" + Proxmox.NodeName; + if (me.filename) { + me.url = initurl + "/backup/" + encodeURIComponent(me.filename); + } else { + throw "neither filename nor snapshot given"; + } me.callParent(); }, -- 2.20.1