extend conflict resolution to function with nested groupfolders #2289
Conversation
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
Signed-off-by: Robin Appelman <[email protected]>
ChristophWurst
approved these changes
Mar 6, 2023
Member
ChristophWurst
left a comment
ChristophWurst
left a comment
There was a problem hiding this comment.
Tested & works
Can't say much about the code changes
| [, $folderId, $relativePath] = explode('/', $conflictPath, 3); | ||
| $conflictsByFolder[(int)$folderId][] = $relativePath; | ||
| } | ||
| $paths = array_merge($paths, ); |
Member
There was a problem hiding this comment.
this doesn't seem right. otoh $paths isn't read anyway so it doesn't do any harm. but the variable can probably go.
Signed-off-by: Robin Appelman <[email protected]>
skjnldsv
added
2. developing
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.
To test
aanda/b, assigningato userxandyand assigninga/bto userxycreate a folderbinside theagroupfolderxandyupload different files intoa/band note that both users see different contentsx, openaand see that it now contains bothbandb (1)y, openaand see thatbhas been renamed tob (1)