webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-12-23 23:02:08 +03:00
Code Activity

Added page revisions. Fixes #2

Browse Source
This commit is contained in:
Dan Brown
2015-08-09 12:06:52 +01:00
parent b2223f1618
commit fbccc6824a
10 changed files with 262 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,19 +31,8 @@ class PageController extends Controller
$this->chapterRepo = $chapterRepo;
}
/**
* Display a listing of the resource.
*
* @return Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
* Show the form for creating a new page.
*
* @param $bookSlug
* @param bool $chapterSlug
@@ -58,7 +47,7 @@ class PageController extends Controller
}
/**
* Store a newly created resource in storage.
* Store a newly created page in storage.
*
* @param Request $request
* @param $bookSlug
@@ -86,11 +75,12 @@ class PageController extends Controller
$page->created_by = Auth::user()->id;
$page->updated_by = Auth::user()->id;
$page->save();
$this->pageRepo->saveRevision($page);
return redirect($page->getUrl());
}
/**
* Display the specified resource.
* Display the specified page.
*
* @param $bookSlug
* @param $pageSlug
@@ -100,12 +90,11 @@ class PageController extends Controller
{
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
//dd($sidebarBookTree);
return view('pages/show', ['page' => $page, 'book' => $book]);
}
/**
* Show the form for editing the specified resource.
* Show the form for editing the specified page.
*
* @param $bookSlug
* @param $pageSlug
@@ -119,7 +108,7 @@ class PageController extends Controller
}
/**
* Update the specified resource in storage.
* Update the specified page in storage.
*
* @param Request $request
* @param $bookSlug
@@ -130,11 +119,7 @@ class PageController extends Controller
{
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$page->fill($request->all());
$page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id, $page->id);
$page->text = strip_tags($page->html);
$page->updated_by = Auth::user()->id;
$page->save();
$this->pageRepo->updatePage($page, $book->id, $request->all());
return redirect($page->getUrl());
}
@@ -205,6 +190,12 @@ class PageController extends Controller
return redirect($book->getUrl());
}
/**
* Show the deletion page for the specified page.
* @param $bookSlug
* @param $pageSlug
* @return \Illuminate\View\View
*/
public function showDelete($bookSlug, $pageSlug)
{
$book = $this->bookRepo->getBySlug($bookSlug);
@@ -213,7 +204,7 @@ class PageController extends Controller
}
/**
* Remove the specified resource from storage.
* Remove the specified page from storage.
*
* @param $bookSlug
* @param $pageSlug
@@ -227,4 +218,42 @@ class PageController extends Controller
$page->delete();
return redirect($book->getUrl());
}
/**
* Shows the last revisions for this page.
* @param $bookSlug
* @param $pageSlug
* @return \Illuminate\View\View
*/
public function showRevisions($bookSlug, $pageSlug)
{
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
return view('pages/revisions', ['page' => $page, 'book' => $book]);
}
/**
* Shows a preview of a single revision
* @param $bookSlug
* @param $pageSlug
* @param $revisionId
* @return \Illuminate\View\View
*/
public function showRevision($bookSlug, $pageSlug, $revisionId)
{
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$revision = $this->pageRepo->getRevisionById($revisionId);
$page->fill($revision->toArray());
return view('pages/revision', ['page' => $page, 'book' => $book]);
}
public function restoreRevision($bookSlug, $pageSlug, $revisionId)
{
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$revision = $this->pageRepo->getRevisionById($revisionId);
$page = $this->pageRepo->updatePage($page, $book->id, $revision->toArray());
return redirect($page->getUrl());
}
}

7
app/Http/routes.php
View File

@@ -18,6 +18,7 @@ Route::group(['middleware' => 'auth'], function() {
Route::group(['prefix' => 'books'], function() {
// Books
Route::get('/', 'BookController@index');
Route::get('/create', 'BookController@create');
Route::post('/', 'BookController@store');
@@ -27,6 +28,7 @@ Route::group(['middleware' => 'auth'], function() {
Route::get('/{slug}', 'BookController@show');
Route::get('/{slug}/delete', 'BookController@showDelete');
// Pages
Route::get('/{bookSlug}/page/create', 'PageController@create');
Route::post('/{bookSlug}/page', 'PageController@store');
Route::get('/{bookSlug}/sort', 'PageController@sortPages');
@@ -36,7 +38,12 @@ Route::group(['middleware' => 'auth'], function() {
Route::get('/{bookSlug}/page/{pageSlug}/delete', 'PageController@showDelete');
Route::put('/{bookSlug}/page/{pageSlug}', 'PageController@update');
Route::delete('/{bookSlug}/page/{pageSlug}', 'PageController@destroy');
//Revisions
Route::get('/{bookSlug}/page/{pageSlug}/revisions', 'PageController@showRevisions');
Route::get('/{bookSlug}/page/{pageSlug}/revisions/{revId}', 'PageController@showRevision');
Route::get('/{bookSlug}/page/{pageSlug}/revisions/{revId}/restore', 'PageController@restoreRevision');
// Chapters
Route::get('/{bookSlug}/chapter/{chapterSlug}/create-page', 'PageController@create');
Route::get('/{bookSlug}/chapter/create', 'ChapterController@create');
Route::post('/{bookSlug}/chapter/create', 'ChapterController@store');