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

Fix open locally with files lock and wopi allow list #3489

Merged
merged 2 commits into from Feb 26, 2024

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Feb 21, 2024

  • fix: Add config option to disable edit locally
  • fix: Allow to unlock through separate endpoint for edit locally

Fix #3487
Fix #3299

Summary

We add a config value for disabling but also address that unlocking the file was no longer working with a WOPI allow list. We now move this to a separate endpoint to handle any prepare steps we need to do before moving to the local editor.

In a second iteration we can further extend this to update the other views to read only or notify them through Collabora.

Configuration option to disable local editing

occ config:app:set richdocuments open_local_editor --value="no"

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl juliushaertl added bug Something isn't working 3. to review Ready to be reviewed labels Feb 21, 2024
@juliushaertl juliushaertl changed the title fix/open locally Fix open locally with files lock and wopi allow list Feb 21, 2024
Copy link
Contributor

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

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

Code changes look good. did not test it though.

@juliushaertl
Copy link
Member Author

/backport to stable28

@juliushaertl
Copy link
Member Author

/backport to stable27

@juliushaertl
Copy link
Member Author

/backport to stable26

@juliushaertl juliushaertl merged commit e191924 into main Feb 26, 2024
56 checks passed
@juliushaertl juliushaertl deleted the fix/open-locally branch February 26, 2024 07:27
Copy link

backportbot bot commented Feb 26, 2024

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

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b backport/3489/stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 5570aa7b 3c583055

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/3489/stable26

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@lpranam
Copy link
Contributor

lpranam commented Mar 8, 2024

is it going to backport to 26? should I backport it manually? @juliushaertl

@juliushaertl
Copy link
Member Author

Sorry I've missed that, the automatic one failed so a manual one is needed. I can check, but if you want to help preparing that, just opening a pr is of course much appreciated.

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 backport-request bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Open file locally" doesn't work Edit locally does not work with WOPI allow list
3 participants