Group shares with same source and target #474
Merged
Conversation
This file contains 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
|
@rullzer, thanks for your PR! By analyzing the annotation information on this pull request, we identified @PVince81, @SergioBertolinSG and @icewind1991 to be potential reviewers |
|
Rebased. |
|
#500 is merged |
|
Also need owncloud/core#25567 |
|
Rebased and added owncloud/core#25567 Lets see what CI says |
|
|
@schiessle already added here ;) |
|
Aah failing intergration tests. I'll look at this later. |
|
@rullzer perfect 😃 |
nickvergessen
added
1. to develop
rullzer
added
3. to review
|
@schiessle @LukasReschke @icewind1991 @MorrisJobke @nickvergessen please review |
|
tested, works 👍 |
|
Tested and works 👍 @rullzer But there is a merge conflict. |
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.
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.
|
@rullzer Do we want this to be shipped with 10? |
|
Yes I'll prepare a backport |
GitHubUser4234
pushed a commit
to GitHubUser4234/server
that referenced
this pull request
Aug 30, 2016
Group shares with same source and target
This was referenced Nov 3, 2020
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.
From owncloud/core#25534 (original owncloud/core#25113)
Please test carefully.
Including upgrading from 9.0
CC: @schiessle @nickvergessen @icewind1991 @LukasReschke @MorrisJobke