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.

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

[stable3.7] Fix version restore #1417

Merged
merged 1 commit into from
Mar 9, 2021
Merged

Conversation

juliusknorr
Copy link
Member

When restoring a version during editing we need to wait for Collabora to be ready and therefore richdocuments needs to trigger the restore MOVE action whenever that is done. In order to avoid a too early restore we need to workaround by disabling the default restore action from the files_versions app.

A proper solution is possible once we have some way to hook into the files sidebar restore process with nextcloud/server#26023 though this should at least make things work again for backward compatibility.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr added bug Something isn't working 3. to review Ready to be reviewed labels Mar 9, 2021
@juliusknorr juliusknorr requested review from rullzer and skjnldsv March 9, 2021 13:58
@rullzer rullzer merged commit c9fcf27 into stable3.7 Mar 9, 2021
@delete-merged-branch delete-merged-branch bot deleted the bugfix/noid/revision-restore branch March 9, 2021 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Ready to be reviewed bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants