Allow current user lock #3206
Merged
Allow current user lock #3206
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 failed tests on run #669 鈫楋笌
Details:
Review all test suite changes for PR #3206 鈫楋笌 |
||||||||||||||||||||
lib/Controller/WopiController.php
Outdated
|
|
||
| // This is a quick custom patch to allow richdocuments to accept lock from current user | ||
| /** @var OCP\IUserSession $userSession */ | ||
| $userSession = \OC::$server->get(\OCP\IUserSession::class); |
There was a problem hiding this comment.
We don't have a user session on those requests, we probably should just check against $wopi->getEditorUid(). However this would then still allow conflicts if the file gets locked by the desktop client and the same user opens it in Collabora.
@ArtificialOwl Can you provide some more backgorund which case this change should cover?
There was a problem hiding this comment.
you can reproduce the issue:
userAlock a shared file,userAopen the freshly locked file with richdocument,- the app will not open the said document
|
juliushaertl
force-pushed
the
fix/noid/allow-current-user-lock
branch
from
6652f3c
to
479037c
Compare
|
Pushed a few adjustments |
juliushaertl
approved these changes
Oct 17, 2023
juliushaertl
force-pushed
the
fix/noid/allow-current-user-lock
branch
3 times, most recently
from
a26d592
to
1df469a
Compare
|
Tested 鉁旓笍 |
juliushaertl
force-pushed
the
fix/noid/allow-current-user-lock
branch
from
1df469a
to
19e0719
Compare
Signed-off-by: Julius H盲rtl <jus@bitgrid.net>
juliushaertl
force-pushed
the
fix/noid/allow-current-user-lock
branch
from
19e0719
to
0a5afd4
Compare
|
/backport to stable27 |
|
/backport to stable26 |
|
/backport to stable25 |
This was referenced Oct 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.