public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 05/10] ui: make Sync/VerifyView and Edit usable without datastore
Date: Mon,  9 Nov 2020 16:01:25 +0100	[thread overview]
Message-ID: <20201109150130.4956-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20201109150130.4956-1-d.csapak@proxmox.com>

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 <d.csapak@proxmox.com>
---
 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





  parent reply	other threads:[~2020-11-09 15:01 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-09 15:01 [pbs-devel] [PATCH proxmox-backup 00/10] add Datastore overview panel Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 01/10] api2/node/tasks: add check_job_store and use it Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 02/10] ui: refactor render_estimate Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 03/10] ui: refactor render_size_usage to Utils Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 04/10] ui: Utils: add parse_datastore_worker_id Dominik Csapak
2020-11-09 15:01 ` Dominik Csapak [this message]
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 06/10] ui: TaskSummary: move state/types/titles out of the controller Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 07/10] ui: TaskSummary: add subPanelModal and datastore parameters Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 08/10] ui: TaskSummary: handle less defined parameters of tasks Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 09/10] ui: add Panels necessary for Datastores Overview Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 10/10] ui: make Datastore clickable again Dominik Csapak
2020-11-09 17:55 ` [pbs-devel] applied series: [PATCH proxmox-backup 00/10] add Datastore overview panel Thomas Lamprecht
2020-11-09 18:28   ` Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201109150130.4956-6-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal