Skip to content

Fix restoring shared versions #18231

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
Merged
rullzer merged 2 commits into from
Dec 9, 2019
Merged

Fix restoring shared versions #18231

rullzer merged 2 commits into from
Dec 9, 2019

Conversation

@rullzer
Copy link
Member

@rullzer rullzer commented Dec 4, 2019

To trigger:

  1. userA shares a folder "testfolder" with userB which contains a file with versions
  2. userB receives the folder in their root.
  3. userB tries to restore a version -> works
  4. userB moves the "testfolder" into another folder "foo"
  5. userB navigates to the file in the folder and try to restore a version -> fails

@icewind1991 please check/continue this. I'm not sure if this is the right way to tackle it.

@rullzer rullzer added bug 2. developing Work in progress labels Dec 4, 2019
@rullzer rullzer added this to the Nextcloud 18 milestone Dec 4, 2019
rullzer and others added 2 commits December 5, 2019 16:50
@rullzer @icewind1991
Fix restoring shared versions
78050ec 
Signed-off-by: Roeland Jago Douma <[email protected]>
@icewind1991
update tests
829f4a1 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 icewind1991 force-pushed the fix/shared_version_restore branch from 8ba872f to 829f4a1 Compare December 5, 2019 16:31
@rullzer rullzer added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 9, 2019
skjnldsv
skjnldsv approved these changes Dec 9, 2019
View reviewed changes
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

Code looks good!
Let's see what CI says

ChristophWurst
ChristophWurst approved these changes Dec 9, 2019
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.

Looks good!

@rullzer rullzer merged commit 061b9bb into master Dec 9, 2019
@rullzer rullzer deleted the fix/shared_version_restore branch December 9, 2019 20:17
@rullzer
Copy link
Member Author

rullzer commented Dec 9, 2019

/backport to stable17

@rullzer
Copy link
Member Author

rullzer commented Dec 9, 2019

/backport to stable16

@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Dec 9, 2019

The backport to stable17 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Dec 9, 2019

The backport to stable16 failed. Please do this backport manually.

This was referenced Dec 11, 2019
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@kesselb kesselb Awaiting requested review from kesselb

Assignees

@icewind1991 icewind1991

Labels

3. to review Waiting for reviews bug

Projects

None yet

Milestone

Nextcloud 18.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@rullzer @ChristophWurst @skjnldsv @icewind1991