From 8cf35ba18eb25579e5a5d3a3a115dd7941c53c67 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 15 May 2023 16:58:59 +0200 Subject: [PATCH] remove quote from api response in share jails Signed-off-by: Christian Richter --- .../unreleased/remove-quota-from-api-for-shares.md | 7 +++++++ services/graph/pkg/service/v0/drives.go | 12 ++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/remove-quota-from-api-for-shares.md diff --git a/changelog/unreleased/remove-quota-from-api-for-shares.md b/changelog/unreleased/remove-quota-from-api-for-shares.md new file mode 100644 index 000000000..c8eeeda22 --- /dev/null +++ b/changelog/unreleased/remove-quota-from-api-for-shares.md @@ -0,0 +1,7 @@ +Enhancement: Remove quota from share jails api responses + +We have removed the quota object from api responses for share jails, +which would permanently show exceeded due to restrictions in the permission system. + +https://github.com/owncloud/ocis/pull/6309 +https://github.com/owncloud/ocis/issues/4472 \ No newline at end of file diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go index 3494b211a..75f53475a 100644 --- a/services/graph/pkg/service/v0/drives.go +++ b/services/graph/pkg/service/v0/drives.go @@ -538,10 +538,14 @@ func (g Graph) formatDrives(ctx context.Context, baseURL *url.URL, storageSpaces // can't access disabled space if utils.ReadPlainFromOpaque(storageSpace.Opaque, "trashed") != _spaceStateTrashed { res.Special = g.getSpecialDriveItems(ctx, baseURL, storageSpace) - quota, err := g.getDriveQuota(ctx, storageSpace) - res.Quota = "a - if err != nil { - return err + if storageSpace.SpaceType != "mountpoint" && storageSpace.SpaceType != "virtual" { + quota, err := g.getDriveQuota(ctx, storageSpace) + res.Quota = "a + if err != nil { + return err + } + } else { + res.Quota = nil } } select {