[PR #5451] [CLOSED] Try and handle conflict on update: it's a plan #6493

New Issue

OVERLORD · 2026-02-05T10:33:46+03:00

OVERLORD commented

2026-02-05 10:33:46 +03:00

📋 Pull Request Information

Original PR: https://github.com/BookStackApp/BookStack/pull/5451
Author: @bendem
Created: 1/28/2025
Status: ❌ Closed

Base: development ← Head: page-conflict

📝 Commits (1)

46f4aa1 Try and handle conflict on update: it's a plan

📊 Changes

4 files changed (+20 additions, -0 deletions)

View changed files

📝 app/Entities/Controllers/PageController.php (+17 -0)
📝 app/Entities/Tools/PageEditorData.php (+1 -0)
📝 lang/en/errors.php (+1 -0)
📝 resources/views/pages/parts/form.blade.php (+1 -0)

📄 Description

This is a plan to fix the data loss part of #395. I know absolutely nothing of the codebase and my years of php are far. I already have a functional PoC, but that's not the best user experience and I'm afraid getting it polished is beyond what I'm able to do for now.

Video of it in action:

https://github.com/user-attachments/assets/93d005e0-a72f-449f-bb8c-9fc04de2023e

_{🔄 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/5451 **Author:** [@bendem](https://github.com/bendem) **Created:** 1/28/2025 **Status:** ❌ Closed **Base:** `development` ← **Head:** `page-conflict` --- ### 📝 Commits (1) - [`46f4aa1`](https://github.com/BookStackApp/BookStack/commit/46f4aa1d1083923dd47c10a62ff60949a1208d1d) Try and handle conflict on update: it's a plan ### 📊 Changes **4 files changed** (+20 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `app/Entities/Controllers/PageController.php` (+17 -0) 📝 `app/Entities/Tools/PageEditorData.php` (+1 -0) 📝 `lang/en/errors.php` (+1 -0) 📝 `resources/views/pages/parts/form.blade.php` (+1 -0) </details> ### 📄 Description This is a plan to fix the data loss part of #395. I know absolutely nothing of the codebase and my years of php are far. I already have a functional PoC, but that's not the best user experience and I'm afraid getting it polished is beyond what I'm able to do for now. Video of it in action: https://github.com/user-attachments/assets/93d005e0-a72f-449f-bb8c-9fc04de2023e --- <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:33:46 +03:00

OVERLORD closed this issue

2026-02-05 10:33:48 +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#6493