Skip to content

Fix restoring shared versions - #18231

Merged
rullzer merged 2 commits into
masterfrom
fix/shared_version_restore
Dec 9, 2019
Merged

Fix restoring shared versions#18231
rullzer merged 2 commits into
masterfrom
fix/shared_version_restore

Conversation

@rullzer

@rullzerrullzer commented Dec 4, 2019

Copy link
Copy Markdown
Member

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.

@rullzerrullzer added bug 2. developing Work in progress labels Dec 4, 2019
@rullzerrullzer added this to the Nextcloud 18 milestone Dec 4, 2019
rullzerand others added 2 commits December 5, 2019 16:50
@rullzer@icewind1991
Fix restoring shared versions
78050ec
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@icewind1991
update tests
829f4a1
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
icewind1991force-pushed the fix/shared_version_restore branch from 8ba872f to 829f4a1CompareDecember 5, 2019 16:31
@rullzerrullzer 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

@skjnldsvskjnldsv left a comment

Copy link
Copy Markdown
Member

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

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

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 masterDec 9, 2019
@rullzer
rullzer deleted the fix/shared_version_restore branch December 9, 2019 20:17
@rullzer

rullzer commented Dec 9, 2019

Copy link
Copy Markdown
MemberAuthor

/backport to stable17

@rullzer

rullzer commented Dec 9, 2019

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@backportbot-nextcloud

backportbot-nextcloudBot commented Dec 9, 2019

Copy link
Copy Markdown

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

@backportbot-nextcloud

backportbot-nextcloudBot commented Dec 9, 2019

Copy link
Copy Markdown

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

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

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@icewind1991icewind1991Awaiting requested review from icewind1991
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@kesselbkesselbAwaiting requested review from kesselb

Assignees

@icewind1991icewind1991

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 18.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer@ChristophWurst@skjnldsv@icewind1991