Merge pull request #12 from ishank011/full-paths

Change order when deciding whether to keep full paths
cs3org · Oct 25, 2021 · 5ece2c7 · 5ece2c7
2 parents a1c7710 + 8ad3bd0
commit 5ece2c7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
@@ -848,12 +848,12 @@ func (h *Handler) addFileInfo(ctx context.Context, s *conversions.ShareData, inf
 		s.ItemSource = wrapResourceID(info.Id)
 		s.FileSource = s.ItemSource
 		switch {
-		case s.ShareType == conversions.ShareTypePublicLink:
-			s.FileTarget = info.Path
-			s.Path = info.Path
 		case h.sharePrefix == "/":
 			s.FileTarget = info.Path
 			s.Path = info.Path
+		case s.ShareType == conversions.ShareTypePublicLink:
+			s.FileTarget = path.Join("/", path.Base(info.Path))
+			s.Path = path.Join("/", path.Base(info.Path))
 		default:
 			s.FileTarget = path.Join(h.sharePrefix, path.Base(info.Path))
 			s.Path = path.Join("/", path.Base(info.Path))