Fix share transfer of single files and on the transfered node#22116
Merged
Fix share transfer of single files and on the transfered node#22116
Conversation
blizzz
approved these changes
Aug 7, 2020
1eb8ddc to
2bbabfc
Compare
MorrisJobke
reviewed
Aug 11, 2020
2bbabfc to
e361e0c
Compare
Member
|
CI says "no". |
d6974b3 to
25b9701
Compare
Signed-off-by: Julius Härtl <jus@bitgrid.net>
e4f77ec to
ac2999a
Compare
Member
Author
|
Ready for another review, since i needed to go a bit of a different way to check if a share is contained in the transferred directory. Tests seem to pass now (before the rebase). I'd actually like to extend the integration tests with some cases for this, but I'm still unable to get them to run locally, so I'd postpone this for a later point. |
Member
Member
|
Actually it seems to be a problem with reshares in general. Steps to reproduce:
Expected result:fileA is reshared from user3 to user2 Actual result:fileA is still reshared from user1 to user2 |
Member
Author
|
Ah, the source path is of course not null if no path is provided. 🙈 |
This was referenced Sep 7, 2020
Member
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #21625
This fixes an issue where shares on single file transfers or on the root folder that is being transfered could not me moved over.
There were two issues here with the current implementation:
server/lib/private/Share20/Manager.php
Lines 302 to 305 in 43efac3
Steps to reproduce:
occ files:transfer-ownership --path=f100.txt admin user2