From 1c9a043330ac255c1220f956c1437cfd99b38f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 23 Aug 2024 16:08:35 +0200 Subject: [PATCH] fix listing trash infinity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/trash-listing-bykey-fixes.md | 1 + internal/http/services/owncloud/ocdav/trashbin.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog/unreleased/trash-listing-bykey-fixes.md b/changelog/unreleased/trash-listing-bykey-fixes.md index dd649013af..0e8f3f836e 100644 --- a/changelog/unreleased/trash-listing-bykey-fixes.md +++ b/changelog/unreleased/trash-listing-bykey-fixes.md @@ -6,4 +6,5 @@ We also fixed the `/dav/spaces` endpoint to not invent a `/` at the end of URLs As a byproduct we now return the size of trashed items. +https://github.com/cs3org/reva/pull/4822 https://github.com/cs3org/reva/pull/4818 diff --git a/internal/http/services/owncloud/ocdav/trashbin.go b/internal/http/services/owncloud/ocdav/trashbin.go index 5e3015e3ef..07fa6c3743 100644 --- a/internal/http/services/owncloud/ocdav/trashbin.go +++ b/internal/http/services/owncloud/ocdav/trashbin.go @@ -271,7 +271,7 @@ func (h *TrashbinHandler) listTrashbin(w http.ResponseWriter, r *http.Request, s for i := len(items) - 1; i >= 0; i-- { // for i := range res.Infos { if items[i].Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER { - stack = append(stack, items[i].Key) + stack = append(stack, items[i].Key+"/") // fetch children of the item } }