From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id DF6C91FF16B for ; Thu, 31 Oct 2024 13:17:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8EDB18EA2; Thu, 31 Oct 2024 13:17:05 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 31 Oct 2024 13:15:12 +0100 Message-Id: <20241031121519.434337-23-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241031121519.434337-1-c.ebner@proxmox.com> References: <20241031121519.434337-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 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 v6 proxmox-backup 22/29] ui: group filter: allow to set namespace for local 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: , 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" The namespace has to be set in order to get the correct groups to be used as group filter options with a local datastore as source, required for sync jobs in push direction. Signed-off-by: Christian Ebner --- changes since version 5: - move namespace checks closer to api method url, showing their dependence more clearly www/form/GroupFilter.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/www/form/GroupFilter.js b/www/form/GroupFilter.js index c9c2d913e..22f889752 100644 --- a/www/form/GroupFilter.js +++ b/www/form/GroupFilter.js @@ -252,14 +252,17 @@ Ext.define('PBS.form.GroupFilter', { let url; if (me.remote) { url = `/api2/json/config/remote/${me.remote}/scan/${me.datastore}/groups`; + if (me.namespace) { + url += `?namespace=${me.namespace}`; + } } else if (me.datastore) { url = `/api2/json/admin/datastore/${me.datastore}/groups`; + if (me.namespace) { + url += `?ns=${me.namespace}`; + } } else { return; } - if (me.namespace) { - url += `?namespace=${me.namespace}`; - } me.setDsStoreUrl(url); me.dsStore.load({ callback: (records) => { @@ -279,6 +282,18 @@ Ext.define('PBS.form.GroupFilter', { } me.remote = undefined; me.datastore = datastore; + me.namespace = undefined; + me.updateGroupSelectors(); + }, + + setLocalNamespace: function(datastore, namespace) { + let me = this; + if (me.datastore === datastore && me.namespace === namespace) { + return; + } + me.remote = undefined; + me.datastore = datastore; + me.namespace = namespace; me.updateGroupSelectors(); }, -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel