github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-23 10:41:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'conflict_warnings' of https://github.com/MatthieuParis/BookStack into MatthieuParis-conflict_warnings

Browse Source
This commit is contained in:
Dan Brown 2021-10-04 17:10:40 +01:00
commit 756b55bbff
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Entities/Tools/PageEditActivity.php
View File

@ -43,6 +43,16 @@ class PageEditActivity
return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]);
}
/**
* Check if the page has been updated since the draft has been saved.
*
* @return bool
*/
public function hasPageBeenUpdatedSinceDraftSaved(PageRevision $draft): bool
{
return $draft->page->updated_at->timestamp >= $draft->updated_at->timestamp;
}
/**
* Get the message to show when the user will be editing one of their drafts.
*

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,
]);
}

3
resources/js/components/page-editor.js
View File

@ -119,6 +119,9 @@ class PageEditor {
}
this.draftNotifyChange(`${resp.data.message} ${Dates.utcTimeStampToLocalTime(resp.data.timestamp)}`);
this.autoSave.last = Date.now();
if (resp.data.warning.length > 0) {
window.$events.emit('warning', resp.data.warning);
}
} catch (err) {
// Save the editor content in LocalStorage as a last resort, just in case.
try {