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 034476A571 for ; Tue, 16 Feb 2021 18:08:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EF02218DEA for ; Tue, 16 Feb 2021 18:07:30 +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 D54C318DD0 for ; Tue, 16 Feb 2021 18:07:29 +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 A046A461DB for ; Tue, 16 Feb 2021 18:07:29 +0100 (CET) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 16 Feb 2021 18:06:53 +0100 Message-Id: <20210216170710.31767-6-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210216170710.31767-1-s.reiter@proxmox.com> References: <20210216170710.31767-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup 05/22] api2/admin/datastore: accept "/" as path for root 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: Tue, 16 Feb 2021 17:08:01 -0000 From: Dominik Csapak makes more sense than sending "root'" Signed-off-by: Dominik Csapak Signed-off-by: Stefan Reiter --- src/api2/admin/datastore.rs | 2 +- www/window/FileBrowser.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index ab88d172..88f011e4 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1328,7 +1328,7 @@ pub fn catalog( let mut catalog_reader = CatalogReader::new(reader); - let path = if filepath != "root" { + let path = if filepath != "root" && filepath != "/" { base64::decode(filepath)? } else { vec![b'/'] diff --git a/www/window/FileBrowser.js b/www/window/FileBrowser.js index 01b5d79b..724e1791 100644 --- a/www/window/FileBrowser.js +++ b/www/window/FileBrowser.js @@ -185,6 +185,7 @@ Ext.define("PBS.window.FileBrowser", { store: { autoLoad: false, model: 'pbs-file-tree', + defaultRootId: '/', nodeParam: 'filepath', sorters: 'text', proxy: { -- 2.20.1