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 5AD4267420 for ; Mon, 9 Nov 2020 16:01:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56A1D1846C for ; Mon, 9 Nov 2020 16:01:33 +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 58E8E1843E for ; Mon, 9 Nov 2020 16:01:32 +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 2441346034 for ; Mon, 9 Nov 2020 16:01:32 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 9 Nov 2020 16:01:25 +0100 Message-Id: <20201109150130.4956-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201109150130.4956-1-d.csapak@proxmox.com> References: <20201109150130.4956-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.389 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: [pbs-devel] [PATCH proxmox-backup 05/10] ui: make Sync/VerifyView and Edit usable without datastore X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2020 15:01:33 -0000 we want to use this panel again for a 'global' overview, without any datastore preselected, so we have to handle that, and adding a datastore selector in the editwindow Signed-off-by: Dominik Csapak --- www/config/SyncView.js | 8 +++++--- www/config/VerifyView.js | 8 +++++--- www/window/SyncJobEdit.js | 11 ++++++++--- www/window/VerifyJobEdit.js | 11 ++++++++--- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/www/config/SyncView.js b/www/config/SyncView.js index 20fc5e86..24990ff0 100644 --- a/www/config/SyncView.js +++ b/www/config/SyncView.js @@ -162,9 +162,11 @@ Ext.define('PBS.config.SyncJobView', { reload: function() { this.getView().getStore().rstore.load(); }, init: function(view) { - view.getStore().rstore.getProxy().setExtraParams({ - store: view.datastore, - }); + let params = {}; + if (view.datastore !== undefined) { + params.store = view.datastore; + } + view.getStore().rstore.getProxy().setExtraParams(params); Proxmox.Utils.monStoreErrors(view, view.getStore().rstore); }, }, diff --git a/www/config/VerifyView.js b/www/config/VerifyView.js index da8e9889..8a0ed6d4 100644 --- a/www/config/VerifyView.js +++ b/www/config/VerifyView.js @@ -157,9 +157,11 @@ Ext.define('PBS.config.VerifyJobView', { reload: function() { this.getView().getStore().rstore.load(); }, init: function(view) { - view.getStore().rstore.getProxy().setExtraParams({ - store: view.datastore, - }); + let params = {}; + if (view.datastore !== undefined) { + params.store = view.datastore; + } + view.getStore().rstore.getProxy().setExtraParams(params); Proxmox.Utils.monStoreErrors(view, view.getStore().rstore); }, }, diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js index 573a4af6..982cec93 100644 --- a/www/window/SyncJobEdit.js +++ b/www/window/SyncJobEdit.js @@ -113,6 +113,7 @@ Ext.define('PBS.window.SyncJobEdit', { me.autoLoad = !!id; me.scheduleValue = id ? null : 'hourly'; me.authid = id ? null : Proxmox.UserName; + me.editDatastore = me.datastore === undefined && me.isCreate; return { }; }, @@ -128,14 +129,18 @@ Ext.define('PBS.window.SyncJobEdit', { }, column1: [ { - xtype: 'displayfield', - name: 'store', + xtype: 'pmxDisplayEditField', fieldLabel: gettext('Local Datastore'), - allowBlank: false, + name: 'store', submitValue: true, cbind: { + editable: '{editDatastore}', value: '{datastore}', }, + editConfig: { + xtype: 'pbsDataStoreSelector', + allowBlank: false, + }, }, { fieldLabel: gettext('Local Owner'), diff --git a/www/window/VerifyJobEdit.js b/www/window/VerifyJobEdit.js index 48a181b6..6153c8e5 100644 --- a/www/window/VerifyJobEdit.js +++ b/www/window/VerifyJobEdit.js @@ -24,6 +24,7 @@ Ext.define('PBS.window.VerifyJobEdit', { me.url = id ? `${baseurl}/${id}` : baseurl; me.method = id ? 'PUT' : 'POST'; me.autoLoad = !!id; + me.editDatastore = me.datastore === undefined && me.isCreate; return { }; }, @@ -45,14 +46,18 @@ Ext.define('PBS.window.VerifyJobEdit', { }, column1: [ { - xtype: 'displayfield', + xtype: 'pmxDisplayEditField', + fieldLabel: gettext('Local Datastore'), name: 'store', - fieldLabel: gettext('Datastore'), - allowBlank: false, submitValue: true, cbind: { + editable: '{editDatastore}', value: '{datastore}', }, + editConfig: { + xtype: 'pbsDataStoreSelector', + allowBlank: false, + }, }, { xtype: 'pbsCalendarEvent', -- 2.20.1