[stable9.1] Group shares with same source and target #25534
Conversation
|
@PVince81, thanks for your PR! By analyzing the annotation information on this pull request, we identified @rullzer, @SergioBertolinSG and @icewind1991 to be potential reviewers |
DeepDiver1975
force-pushed
the
stable9.1-group_shares
branch
from
4302624
to
76c9b9d
Compare
|
rebased |
|
Oracle is not happy: -> Since we have tests related to DB, better make sure it works there too. (it did on master though) |
Let's hold this for now. I'll try and fix these on master and then we can cherry-pick the changes into this PR. |
Fixes #24575 Note that this is a very limited solution and eventually we want smarter merging!
The repair step was a bit overeager to skip repairing so it missed the case where a group share exists without subshares but with an additional direct user share.
PVince81
force-pushed
the
stable9.1-group_shares
branch
from
76c9b9d
to
430090c
Compare
|
cherry-picked #25567 and rebased |
In some situations, a group share is created before a user share, and the recipient renamed the received share before the latter is created. In this situation, the "file_target" was already modified and the second created share must align to the already renamed share. To achieve this, the MountProvider now groups only by "item_source" value and sorts by share time. This makes it so that the least recent share is selected as super-share and its "file_target" value is then adjusted in all grouped shares. This fixes the issue where this situation would have different "file_target" values resulting in two shared folders appearing instead of one.
|
Cherry-picked #25568 to fix the issue mentionned in the PR, which is the same as #25543 (comment) This is now ready for review again, I hope we covered all cases now ! |
|
@rullzer please give this a quick review, should be the same code as the other PRs to master + this one: #25568 @DeepDiver1975 this PR here can be merged after #25568 is merged. |
|
👍 works fine. |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Backport of #25113 to stable9.1
Please note that the version check has been adjusted for this branch.
Please review @owncloud/sharing @owncloud/qa