-
-
Notifications
You must be signed in to change notification settings - Fork 171
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
New LockException and Lock Dialog #6835
Merged
Merged
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
2 tasks
distantnative
force-pushed
the
v5/lock-response
branch
from
December 6, 2024 08:07
118c2fc
to
e0d9912
Compare
I guess it makes sense to merge this first: #6839 and then continue with this |
distantnative
force-pushed
the
v5/lock-response
branch
from
December 6, 2024 12:54
e0d9912
to
db9968c
Compare
@bastianallgeier I added the suggested changes, please have a look if it's fine for you. |
@distantnative looks great! |
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.
Description
Merge first
Summary of changes
Kirby\Content\LockException
k-lock-dialog
panel.content.lockDialog
methodReasoning
When an editor starts editing, but someone else made changes at the same time, there can be a race condition where the editor can no longer save or publish the changes because the other one was faster. This is now handled with a new dialog to inform the editor in a good way and reload the view afterwards.
The new LockException is used to throw a custom error with all the lock details. This is used in the Panel to fill the dialog with the necessary information.
Testing
The easiest way to test this is to make sure that you have two users. Let's assume, the second one has the id "editor"
The new dialog should appear and give you the right information about the lock. Closing the dialog should reload the view.