Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

extend conflict resolution to function with nested groupfolders #2289

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

extend conflict resolution to function with nested groupfolders #2289

wants to merge 2 commits into from

Conversation

icewind1991
Copy link
Member

To test

  • starting with current master
  • create 2 groupfolders a and a/b, assigning a to user x and y and assigning a/b to user x
  • as user y create a folder b inside the a groupfolder
  • as both x and y upload different files into a/b and note that both users see different contents
  • apply this patch
  • as x, open a and see that it now contains both b and b (1)
  • as y, open a and see that b has been renamed to b (1)

@icewind1991 icewind1991 added the 3. to review Items that need to be reviewed label Mar 6, 2023
ChristophWurst
ChristophWurst approved these changes Mar 6, 2023
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested & works

Can't say much about the code changes

ChristophWurst
ChristophWurst reviewed Mar 6, 2023
View reviewed changes
lib/Mount/MountProvider.php
[, $folderId, $relativePath] = explode('/', $conflictPath, 3);
$conflictsByFolder[(int)$folderId][] = $relativePath;
}
$paths = array_merge($paths, );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesn't seem right. otoh $paths isn't read anyway so it doesn't do any harm. but the variable can probably go.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @icewind1991

@skjnldsv skjnldsv added 2. developing Items that are currently under development and removed 3. to review Items that need to be reviewed labels Aug 28, 2024
@skjnldsv skjnldsv marked this pull request as draft August 30, 2024 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv left review comments

@ChristophWurst ChristophWurst ChristophWurst approved these changes

Assignees
No one assigned
Labels
2. developing Items that are currently under development
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@icewind1991 @ChristophWurst @skjnldsv