Skip to content

Commit b218276

Browse files
authored
Merge pull request #11538 from 2403905/issues/OCISDEV-198
fix: [OCISDEV-198] Fix space root handling in a graph sharedByMe
2 parents 59db4cd + 1157aed commit b218276

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Bugfix: Fix space root handling in a sharedByMe
2+
3+
Fix space root handling in a graph sharedByMe
4+
5+
https://github.com/owncloud/ocis/pull/11533

services/graph/pkg/service/v0/driveitems.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,12 @@ func cs3ResourceToDriveItem(logger *log.Logger, res *storageprovider.ResourceInf
442442
Size: size,
443443
}
444444

445-
if name := path.Base(res.GetPath()); name != "" {
446-
driveItem.Name = &name
445+
name := res.GetName()
446+
if name == "" {
447+
name = path.Base(res.GetPath())
447448
}
449+
driveItem.Name = &name
450+
448451
if res.GetEtag() != "" {
449452
driveItem.ETag = &res.Etag
450453
}

tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,6 @@ The expected failures in this file are from features in the owncloud/ocis repo.
329329
- [apiAuthApp/token.feature:183](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiAuthApp/token.feature#L183)
330330
- [apiAuthApp/token.feature:189](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiAuthApp/token.feature#L189)
331331

332-
#### [[Sharing NG] sharedByMe endpoint is missing data for drives shared via link](https://github.com/owncloud/ocis/issues/8355)
333-
334-
- [apiSharingNgShares/sharedByMe.feature:3324](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNgShares/sharedByMe.feature#L3324)
335-
- [apiSharingNgShares/sharedByMe.feature:3873](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNgShares/sharedByMe.feature#L3873)
336-
337332
#### [Missing shareid on response of a PROPFIND on the sharejail root](https://github.com/owncloud/ocis/issues/8510)
338333

339334
- [apiContract/propfindShares.feature:170](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiContract/propfindShares.feature#L170)

0 commit comments

Comments
 (0)