github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-01 13:53:09 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
MatthieuParis
2021-08-08 19:20:15 +02:00
parent c429cf7818
commit 537b1614c4
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/PageController.php
View File

@ -258,6 +258,23 @@ class PageController extends Controller
return $this->jsonError(trans('errors.guests_cannot_save_drafts'), 500);
}
// Check for active editing or time conflict
$warnings = [];
$jsonResponseWarning = '';
$editActivity = new PageEditActivity($page);
if ($editActivity->hasActiveEditing()) {
$warnings[] = $editActivity->activeEditingMessage();
}
$userDraft = $this->pageRepo->getUserDraft($page);
if ($userDraft !== null) {
if ($editActivity->hasPageBeenUpdatedSinceDraftSaved($userDraft)) {
$warnings[] = $editActivity->getEditingActiveDraftMessage($userDraft);
}
}
if (count($warnings) > 0) {
$jsonResponseWarning = implode("\n", $warnings);
}
$draft = $this->pageRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
$updateTime = $draft->updated_at->timestamp;
@ -265,6 +282,7 @@ class PageController extends Controller
return response()->json([
'status' => 'success',
'message' => trans('entities.pages_edit_draft_save_at'),
'warning' => $jsonResponseWarning,
'timestamp' => $updateTime,
]);
}