github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-29 11:30:50 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

html diff in revision view

Browse Source
This commit is contained in:
Younès EL BIACHE
2016-07-07 19:42:21 +02:00
parent 10418323ef
commit 9537e2ae95
6 changed files with 589 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ use BookStack\Repos\ChapterRepo;
use BookStack\Repos\PageRepo;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Views;
use Icap\HtmlDiff\HtmlDiff;
class PageController extends Controller
{
@ -332,9 +333,19 @@ class PageController extends Controller
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$revision = $this->pageRepo->getRevisionById($revisionId);
$next = $revision->getNext() ?: $page;
$htmlDiff = new HtmlDiff($revision->html, $next->html, true);
$diff = $htmlDiff->outputDiff()->toString();
$page->fill($revision->toArray());
$this->setPageTitle('Page Revision For ' . $page->getShortName());
return view('pages/revision', ['page' => $page, 'book' => $book]);
return view('pages/revision', [
'page' => $page,
'book' => $book,
'diff' => $diff,
]);
}
/**