From dc193e8197e13dd2108f2529570ed330fb267fa7 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sat, 14 May 2022 18:29:09 +0200 Subject: [PATCH] ui: remote target ns selector: fix clearing value on edit never makes sense to clear the value due to remote or remoteStore change as we weren't enabled then in the first place. This fixes clearing the currently set namespace on editing an existing job, which always made it seem like the Root namespace was selected, even if the originalValue was correct (thus the dirty-form reset/ok behaviour still worked, making it even more confusing) Signed-off-by: Thomas Lamprecht --- www/form/RemoteTargetSelector.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/www/form/RemoteTargetSelector.js b/www/form/RemoteTargetSelector.js index 6abae5af..cc710eed 100644 --- a/www/form/RemoteTargetSelector.js +++ b/www/form/RemoteTargetSelector.js @@ -121,20 +121,24 @@ Ext.define('PBS.form.RemoteNamespaceSelector', { setRemote: function(remote) { let me = this; - if (me.remote === remote) { + let previousRemote = me.remote; + if (previousRemote === remote) { return; } me.remote = remote; me.store.removeAll(); - me.setDisabled(true); - me.clearValue(); + if (previousRemote) { + me.setDisabled(true); + me.clearValue(); + } }, setRemoteStore: function(remoteStore) { let me = this; - if (me.remoteStore === remoteStore) { + let previousStore = me.remoteStore; + if (previousStore === remoteStore) { return; } me.remoteStore = remoteStore; @@ -153,7 +157,7 @@ Ext.define('PBS.form.RemoteNamespaceSelector', { me.store.load(); me.firstLoad = false; - } else { + } else if (previousStore) { me.setDisabled(true); me.clearValue(); }