From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 6610C1FF164 for ; Fri, 22 Nov 2024 17:54:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5FFAE17FB3; Fri, 22 Nov 2024 17:54:57 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 22 Nov 2024 17:54:06 +0100 Message-Id: <20241122165406.676851-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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] ui: sync job: fix source group filters based on sync direction 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Fix switching the source for group filters based on the sync jobs sync direction. The helper to set the local namespace for the group filers was introduced in commit 43a92c8c ("ui: group filter: allow to set namespace for local datastore"), but never used because lost during subsequent iterations of reworking the patch series. The switching is corrected by: - correctly initializing the local store and namespace for the group filer of sync jobs in push direction in the controller init. - fixing an incorrect check for the sync direction in the remote datastore selector change listener. - conditionally switching namespace to be set for the group filter in the remote and local namespace selector change listeners. Reported-by: Lukas Wagner Signed-off-by: Christian Ebner --- www/window/SyncJobEdit.js | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js index 0e648e7b3..4f46eacc4 100644 --- a/www/window/SyncJobEdit.js +++ b/www/window/SyncJobEdit.js @@ -69,6 +69,16 @@ Ext.define('PBS.window.SyncJobEdit', { let nsSelector = view.down('pbsNamespaceSelector[name=ns]'); nsSelector.setDatastore(value); }, + + init: function() { + let view = this.getView(); + if (view.syncDirectionPush) { + let localNs = view.down('pbsNamespaceSelector[name=ns]').getValue(); + let localStore = view.down('field[name=store]').getValue(); + view.down('pbsGroupFilter').setLocalDatastore(localStore); + view.down('pbsGroupFilter').setLocalNamespace(localStore, localNs); + } + } }, setValues: function(values) { @@ -134,6 +144,11 @@ Ext.define('PBS.window.SyncJobEdit', { let me = this; let view = me.up('pbsSyncJobEdit'); + if (view.syncDirectionPush) { + let localStore = view.down('field[name=store]').getValue(); + view.down('pbsGroupFilter').setLocalNamespace(localStore, localNs); + } + let remoteNs = view.down('pbsRemoteNamespaceSelector[name=remote-ns]').getValue(); let maxDepthField = view.down('field[name=max-depth]'); maxDepthField.setLimit(localNs, remoteNs); @@ -268,7 +283,8 @@ Ext.define('PBS.window.SyncJobEdit', { remoteNamespaceField.setRemote(remote); remoteNamespaceField.setRemoteStore(value); - if (!me.syncDirectionPush) { + let view = me.up('pbsSyncJobEdit'); + if (!view.syncDirectionPush) { me.up('tabpanel').down('pbsGroupFilter').setRemoteDatastore(remote, value); } else { let localStore = me.up('pbsSyncJobEdit').down('field[name=store]').getValue(); @@ -293,7 +309,10 @@ Ext.define('PBS.window.SyncJobEdit', { let remote = view.down('field[name=remote]').getValue(); let remoteStore = view.down('field[name=remote-store]').getValue(); - me.up('tabpanel').down('pbsGroupFilter').setRemoteNamespace(remote, remoteStore, remoteNs); + + if (!view.syncDirectionPush) { + me.up('tabpanel').down('pbsGroupFilter').setRemoteNamespace(remote, remoteStore, remoteNs); + } let localNs = view.down('pbsNamespaceSelector[name=ns]').getValue(); let maxDepthField = view.down('field[name=max-depth]'); -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel