[PR #2877] [MERGED] Concurrent page editing: more warnings #6084

New Issue

OVERLORD · 2026-02-05T10:24:09+03:00

OVERLORD commented

2026-02-05 10:24:09 +03:00

📋 Pull Request Information

Original PR: https://github.com/BookStackApp/BookStack/pull/2877
Author: @MatthieuParis
Created: 8/8/2021
Status: ✅ Merged
Merged: 10/4/2021
Merged by: @ssddanbrown

Base: master ← Head: conflict_warnings

📝 Commits (3)

537b161 Display warnings when saving draft if another user is editing the page or if the page was updated since the current user has started editing the page.
c2e031a Testing command suppressed.
3c4415f Typo.

📊 Changes

3 files changed (+31 additions, -0 deletions)

View changed files

📝 app/Entities/Tools/PageEditActivity.php (+10 -0)
📝 app/Http/Controllers/PageController.php (+18 -0)
📝 resources/js/components/page-editor.js (+3 -0)

📄 Description

Currently, warnings are displayed if two users are editing the same page at the same moment. More precisely, a warning is displayed if a second user starts editing a page when a first user has already opened the editor AND saved a first draft. If those two people open the page at the same moment (thus no draft is saved yet), they get no warning.

This patch adds a warning each time a draft is saved, when several users are editing the same page (with a draft already saved for each of them) or when the edited draft is older than the last page version.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/BookStackApp/BookStack/pull/2877 **Author:** [@MatthieuParis](https://github.com/MatthieuParis) **Created:** 8/8/2021 **Status:** ✅ Merged **Merged:** 10/4/2021 **Merged by:** [@ssddanbrown](https://github.com/ssddanbrown) **Base:** `master` ← **Head:** `conflict_warnings` --- ### 📝 Commits (3) - [`537b161`](https://github.com/BookStackApp/BookStack/commit/537b1614c475ac1a9ff7455eae7e447c7d4a709f) Display warnings when saving draft if another user is editing the page or if the page was updated since the current user has started editing the page. - [`c2e031a`](https://github.com/BookStackApp/BookStack/commit/c2e031ae3e012b82978424c5ea89eb416e283b82) Testing command suppressed. - [`3c4415f`](https://github.com/BookStackApp/BookStack/commit/3c4415f3ff460ed7463ca7e674767dc570269b2f) Typo. ### 📊 Changes **3 files changed** (+31 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `app/Entities/Tools/PageEditActivity.php` (+10 -0) 📝 `app/Http/Controllers/PageController.php` (+18 -0) 📝 `resources/js/components/page-editor.js` (+3 -0) </details> ### 📄 Description Currently, warnings are displayed if two users are editing the same page at the same moment. More precisely, a warning is displayed if a second user starts editing a page when a first user has already opened the editor AND saved a first draft. If those two people open the page at the same moment (thus no draft is saved yet), they get no warning. This patch adds a warning each time a draft is saved, when several users are editing the same page (with a draft already saved for each of them) or when the edited draft is older than the last page version. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

OVERLORD added the pull-request label 2026-02-05 10:24:09 +03:00

OVERLORD closed this issue

2026-02-05 10:24:11 +03:00

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/BookStack#6084