X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/afc3583be875a1d7fd66b6ef14752c08695edab3..refs/pull/274/head:/app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index e250d8c85..6ed9fc30c 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -2,38 +2,31 @@ use Activity; use BookStack\Exceptions\NotFoundException; +use BookStack\Repos\EntityRepo; use BookStack\Repos\UserRepo; use BookStack\Services\ExportService; +use Carbon\Carbon; use Illuminate\Http\Request; -use BookStack\Http\Requests; -use BookStack\Repos\BookRepo; -use BookStack\Repos\ChapterRepo; -use BookStack\Repos\PageRepo; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Illuminate\Http\Response; use Views; +use GatherContent\Htmldiff\Htmldiff; class PageController extends Controller { - protected $pageRepo; - protected $bookRepo; - protected $chapterRepo; + protected $entityRepo; protected $exportService; protected $userRepo; /** * PageController constructor. - * @param PageRepo $pageRepo - * @param BookRepo $bookRepo - * @param ChapterRepo $chapterRepo + * @param EntityRepo $entityRepo * @param ExportService $exportService * @param UserRepo $userRepo */ - public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService, UserRepo $userRepo) + public function __construct(EntityRepo $entityRepo, ExportService $exportService, UserRepo $userRepo) { - $this->pageRepo = $pageRepo; - $this->bookRepo = $bookRepo; - $this->chapterRepo = $chapterRepo; + $this->entityRepo = $entityRepo; $this->exportService = $exportService; $this->userRepo = $userRepo; parent::__construct(); @@ -41,43 +34,82 @@ class PageController extends Controller /** * Show the form for creating a new page. - * @param $bookSlug - * @param bool $chapterSlug + * @param string $bookSlug + * @param string $chapterSlug * @return Response * @internal param bool $pageSlug */ - public function create($bookSlug, $chapterSlug = false) + public function create($bookSlug, $chapterSlug = null) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : null; + $book = $this->entityRepo->getBySlug('book', $bookSlug); + $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : null; $parent = $chapter ? $chapter : $book; $this->checkOwnablePermission('page-create', $parent); - $this->setPageTitle('Create New Page'); - $draft = $this->pageRepo->getDraftPage($book, $chapter); - return redirect($draft->getUrl()); + // Redirect to draft edit screen if signed in + if ($this->signedIn) { + $draft = $this->entityRepo->getDraftPage($book, $chapter); + return redirect($draft->getUrl()); + } + + // Otherwise show edit view + $this->setPageTitle(trans('entities.pages_new')); + return view('pages/guest-create', ['parent' => $parent]); + } + + /** + * Create a new page as a guest user. + * @param Request $request + * @param string $bookSlug + * @param string|null $chapterSlug + * @return mixed + * @throws NotFoundException + */ + public function createAsGuest(Request $request, $bookSlug, $chapterSlug = null) + { + $this->validate($request, [ + 'name' => 'required|string|max:255' + ]); + + $book = $this->entityRepo->getBySlug('book', $bookSlug); + $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : null; + $parent = $chapter ? $chapter : $book; + $this->checkOwnablePermission('page-create', $parent); + + $page = $this->entityRepo->getDraftPage($book, $chapter); + $this->entityRepo->publishPageDraft($page, [ + 'name' => $request->get('name'), + 'html' => '' + ]); + return redirect($page->getUrl('/edit')); } /** * Show form to continue editing a draft page. - * @param $bookSlug - * @param $pageId + * @param string $bookSlug + * @param int $pageId * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function editDraft($bookSlug, $pageId) { - $book = $this->bookRepo->getBySlug($bookSlug); - $draft = $this->pageRepo->getById($pageId, true); - $this->checkOwnablePermission('page-create', $draft); - $this->setPageTitle('Edit Page Draft'); - - return view('pages/create', ['draft' => $draft, 'book' => $book]); + $draft = $this->entityRepo->getById('page', $pageId, true); + $this->checkOwnablePermission('page-create', $draft->book); + $this->setPageTitle(trans('entities.pages_edit_draft')); + + $draftsEnabled = $this->signedIn; + return view('pages/edit', [ + 'page' => $draft, + 'book' => $draft->book, + 'isDraft' => true, + 'draftsEnabled' => $draftsEnabled + ]); } /** * Store a new page by changing a draft into a page. * @param Request $request * @param string $bookSlug + * @param int $pageId * @return Response */ public function store(Request $request, $bookSlug, $pageId) @@ -87,21 +119,21 @@ class PageController extends Controller ]); $input = $request->all(); - $book = $this->bookRepo->getBySlug($bookSlug); + $book = $this->entityRepo->getBySlug('book', $bookSlug); - $draftPage = $this->pageRepo->getById($pageId, true); + $draftPage = $this->entityRepo->getById('page', $pageId, true); - $chapterId = $draftPage->chapter_id; - $parent = $chapterId !== 0 ? $this->chapterRepo->getById($chapterId) : $book; + $chapterId = intval($draftPage->chapter_id); + $parent = $chapterId !== 0 ? $this->entityRepo->getById('chapter', $chapterId) : $book; $this->checkOwnablePermission('page-create', $parent); if ($parent->isA('chapter')) { - $input['priority'] = $this->chapterRepo->getNewPriority($parent); + $input['priority'] = $this->entityRepo->getNewChapterPriority($parent); } else { - $input['priority'] = $this->bookRepo->getNewPriority($parent); + $input['priority'] = $this->entityRepo->getNewBookPriority($parent); } - $page = $this->pageRepo->publishDraft($draftPage, $input); + $page = $this->entityRepo->publishPageDraft($draftPage, $input); Activity::add($page, 'page_create', $book->id); return redirect($page->getUrl()); @@ -109,81 +141,88 @@ class PageController extends Controller /** * Display the specified page. - * If the page is not found via the slug the - * revisions are searched for a match. - * @param $bookSlug - * @param $pageSlug + * If the page is not found via the slug the revisions are searched for a match. + * @param string $bookSlug + * @param string $pageSlug * @return Response */ public function show($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - try { - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); } catch (NotFoundException $e) { - $page = $this->pageRepo->findPageUsingOldSlug($pageSlug, $bookSlug); + $page = $this->entityRepo->getPageByOldSlug($pageSlug, $bookSlug); if ($page === null) abort(404); return redirect($page->getUrl()); } - $sidebarTree = $this->bookRepo->getChildren($book); + $this->checkOwnablePermission('page-view', $page); + + $sidebarTree = $this->entityRepo->getBookChildren($page->book); + $pageNav = $this->entityRepo->getPageNav($page); + Views::add($page); $this->setPageTitle($page->getShortName()); - return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page, 'sidebarTree' => $sidebarTree]); + return view('pages/show', ['page' => $page, 'book' => $page->book, + 'current' => $page, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]); } /** * Get page from an ajax request. - * @param $pageId + * @param int $pageId * @return \Illuminate\Http\JsonResponse */ public function getPageAjax($pageId) { - $page = $this->pageRepo->getById($pageId); + $page = $this->entityRepo->getById('page', $pageId); return response()->json($page); } /** * Show the form for editing the specified page. - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return Response */ public function edit($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $this->checkOwnablePermission('page-update', $page); - $this->setPageTitle('Editing Page ' . $page->getShortName()); + $this->setPageTitle(trans('entities.pages_editing_named', ['pageName'=>$page->getShortName()])); $page->isDraft = false; // Check for active editing $warnings = []; - if ($this->pageRepo->isPageEditingActive($page, 60)) { - $warnings[] = $this->pageRepo->getPageEditingActiveMessage($page, 60); + if ($this->entityRepo->isPageEditingActive($page, 60)) { + $warnings[] = $this->entityRepo->getPageEditingActiveMessage($page, 60); } // Check for a current draft version for this user - if ($this->pageRepo->hasUserGotPageDraft($page, $this->currentUser->id)) { - $draft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id); + if ($this->entityRepo->hasUserGotPageDraft($page, $this->currentUser->id)) { + $draft = $this->entityRepo->getUserPageDraft($page, $this->currentUser->id); $page->name = $draft->name; $page->html = $draft->html; $page->markdown = $draft->markdown; $page->isDraft = true; - $warnings [] = $this->pageRepo->getUserPageDraftMessage($draft); + $warnings [] = $this->entityRepo->getUserPageDraftMessage($draft); } if (count($warnings) > 0) session()->flash('warning', implode("\n", $warnings)); - return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]); + $draftsEnabled = $this->signedIn; + return view('pages/edit', [ + 'page' => $page, + 'book' => $page->book, + 'current' => $page, + 'draftsEnabled' => $draftsEnabled + ]); } /** * Update the specified page in storage. * @param Request $request - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return Response */ public function update(Request $request, $bookSlug, $pageSlug) @@ -191,171 +230,205 @@ class PageController extends Controller $this->validate($request, [ 'name' => 'required|string|max:255' ]); - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $this->checkOwnablePermission('page-update', $page); - $this->pageRepo->updatePage($page, $book->id, $request->all()); - Activity::add($page, 'page_update', $book->id); + $this->entityRepo->updatePage($page, $page->book->id, $request->all()); + Activity::add($page, 'page_update', $page->book->id); return redirect($page->getUrl()); } /** * Save a draft update as a revision. * @param Request $request - * @param $pageId + * @param int $pageId * @return \Illuminate\Http\JsonResponse */ public function saveDraft(Request $request, $pageId) { - $page = $this->pageRepo->getById($pageId, true); + $page = $this->entityRepo->getById('page', $pageId, true); $this->checkOwnablePermission('page-update', $page); - if ($page->draft) { - $draft = $this->pageRepo->updateDraftPage($page, $request->only(['name', 'html', 'markdown'])); - } else { - $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html', 'markdown'])); + + if (!$this->signedIn) { + return response()->json([ + 'status' => 'error', + 'message' => trans('errors.guests_cannot_save_drafts'), + ], 500); } - $updateTime = $draft->updated_at->format('H:i'); - return response()->json(['status' => 'success', 'message' => 'Draft saved at ' . $updateTime]); + + $draft = $this->entityRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown'])); + + $updateTime = $draft->updated_at->timestamp; + $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset; + return response()->json([ + 'status' => 'success', + 'message' => trans('entities.pages_edit_draft_save_at'), + 'timestamp' => $utcUpdateTimestamp + ]); } /** * Redirect from a special link url which * uses the page id rather than the name. - * @param $pageId + * @param int $pageId * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function redirectFromLink($pageId) { - $page = $this->pageRepo->getById($pageId); + $page = $this->entityRepo->getById('page', $pageId); return redirect($page->getUrl()); } /** * Show the deletion page for the specified page. - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return \Illuminate\View\View */ public function showDelete($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $this->checkOwnablePermission('page-delete', $page); - $this->setPageTitle('Delete Page ' . $page->getShortName()); - return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]); + $this->setPageTitle(trans('entities.pages_delete_named', ['pageName'=>$page->getShortName()])); + return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]); } /** * Show the deletion page for the specified page. - * @param $bookSlug - * @param $pageId + * @param string $bookSlug + * @param int $pageId * @return \Illuminate\View\View * @throws NotFoundException */ public function showDeleteDraft($bookSlug, $pageId) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getById($pageId, true); + $page = $this->entityRepo->getById('page', $pageId, true); $this->checkOwnablePermission('page-update', $page); - $this->setPageTitle('Delete Draft Page ' . $page->getShortName()); - return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]); + $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName'=>$page->getShortName()])); + return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]); } /** * Remove the specified page from storage. - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return Response * @internal param int $id */ public function destroy($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $book = $page->book; $this->checkOwnablePermission('page-delete', $page); Activity::addMessage('page_delete', $book->id, $page->name); - session()->flash('success', 'Page deleted'); - $this->pageRepo->destroy($page); + session()->flash('success', trans('entities.pages_delete_success')); + $this->entityRepo->destroyPage($page); return redirect($book->getUrl()); } /** * Remove the specified draft page from storage. - * @param $bookSlug - * @param $pageId + * @param string $bookSlug + * @param int $pageId * @return Response * @throws NotFoundException */ public function destroyDraft($bookSlug, $pageId) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getById($pageId, true); + $page = $this->entityRepo->getById('page', $pageId, true); + $book = $page->book; $this->checkOwnablePermission('page-update', $page); - session()->flash('success', 'Draft deleted'); - $this->pageRepo->destroy($page); + session()->flash('success', trans('entities.pages_delete_draft_success')); + $this->entityRepo->destroyPage($page); return redirect($book->getUrl()); } /** * Shows the last revisions for this page. - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return \Illuminate\View\View */ public function showRevisions($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); - $this->setPageTitle('Revisions For ' . $page->getShortName()); - return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()])); + return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]); } /** * Shows a preview of a single revision - * @param $bookSlug - * @param $pageSlug - * @param $revisionId + * @param string $bookSlug + * @param string $pageSlug + * @param int $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 = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $revision = $this->entityRepo->getById('page_revision', $revisionId, false); + + $page->fill($revision->toArray()); + $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()])); + + return view('pages/revision', [ + 'page' => $page, + 'book' => $page->book, + ]); + } + + /** + * Shows the changes of a single revision + * @param string $bookSlug + * @param string $pageSlug + * @param int $revisionId + * @return \Illuminate\View\View + */ + public function showRevisionChanges($bookSlug, $pageSlug, $revisionId) + { + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $revision = $this->entityRepo->getById('page_revision', $revisionId); + + $prev = $revision->getPrevious(); + $prevContent = ($prev === null) ? '' : $prev->html; + $diff = (new Htmldiff)->diff($prevContent, $revision->html); + $page->fill($revision->toArray()); - $this->setPageTitle('Page Revision For ' . $page->getShortName()); - return view('pages/revision', ['page' => $page, 'book' => $book]); + $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()])); + + return view('pages/revision', [ + 'page' => $page, + 'book' => $page->book, + 'diff' => $diff, + ]); } /** * Restores a page using the content of the specified revision. - * @param $bookSlug - * @param $pageSlug - * @param $revisionId + * @param string $bookSlug + * @param string $pageSlug + * @param int $revisionId * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function restoreRevision($bookSlug, $pageSlug, $revisionId) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $this->checkOwnablePermission('page-update', $page); - $page = $this->pageRepo->restoreRevision($page, $book, $revisionId); - Activity::add($page, 'page_restore', $book->id); + $page = $this->entityRepo->restorePageRevision($page, $page->book, $revisionId); + Activity::add($page, 'page_restore', $page->book->id); return redirect($page->getUrl()); } /** * Exports a page to pdf format using barryvdh/laravel-dompdf wrapper. * https://github.com/barryvdh/laravel-dompdf - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return \Illuminate\Http\Response */ public function exportPdf($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $pdfContent = $this->exportService->pageToPdf($page); return response()->make($pdfContent, 200, [ 'Content-Type' => 'application/octet-stream', @@ -365,14 +438,13 @@ class PageController extends Controller /** * Export a page to a self-contained HTML file. - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return \Illuminate\Http\Response */ public function exportHtml($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $containedHtml = $this->exportService->pageToContainedHtml($page); return response()->make($containedHtml, 200, [ 'Content-Type' => 'application/octet-stream', @@ -382,14 +454,13 @@ class PageController extends Controller /** * Export a page to a simple plaintext .txt file. - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return \Illuminate\Http\Response */ public function exportPlainText($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $containedHtml = $this->exportService->pageToPlainText($page); return response()->make($containedHtml, 200, [ 'Content-Type' => 'application/octet-stream', @@ -403,9 +474,9 @@ class PageController extends Controller */ public function showRecentlyCreated() { - $pages = $this->pageRepo->getRecentlyCreatedPaginated(20); + $pages = $this->entityRepo->getRecentlyCreatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-created')); return view('pages/detailed-listing', [ - 'title' => 'Recently Created Pages', + 'title' => trans('entities.recently_created_pages'), 'pages' => $pages ]); } @@ -416,23 +487,22 @@ class PageController extends Controller */ public function showRecentlyUpdated() { - $pages = $this->pageRepo->getRecentlyUpdatedPaginated(20); + $pages = $this->entityRepo->getRecentlyUpdatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-updated')); return view('pages/detailed-listing', [ - 'title' => 'Recently Updated Pages', + 'title' => trans('entities.recently_updated_pages'), 'pages' => $pages ]); } /** * Show the Restrictions view. - * @param $bookSlug - * @param $pageSlug + * @param string $bookSlug + * @param string $pageSlug * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function showRestrict($bookSlug, $pageSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $this->checkOwnablePermission('restrictions-manage', $page); $roles = $this->userRepo->getRestrictableRoles(); return view('pages/restrictions', [ @@ -442,19 +512,72 @@ class PageController extends Controller } /** - * Set the restrictions for this page. - * @param $bookSlug - * @param $pageSlug + * Show the view to choose a new parent to move a page into. + * @param string $bookSlug + * @param string $pageSlug + * @return mixed + * @throws NotFoundException + */ + public function showMove($bookSlug, $pageSlug) + { + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $this->checkOwnablePermission('page-update', $page); + return view('pages/move', [ + 'book' => $page->book, + 'page' => $page + ]); + } + + /** + * Does the action of moving the location of a page + * @param string $bookSlug + * @param string $pageSlug + * @param Request $request + * @return mixed + * @throws NotFoundException + */ + public function move($bookSlug, $pageSlug, Request $request) + { + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $this->checkOwnablePermission('page-update', $page); + + $entitySelection = $request->get('entity_selection', null); + if ($entitySelection === null || $entitySelection === '') { + return redirect($page->getUrl()); + } + + $stringExploded = explode(':', $entitySelection); + $entityType = $stringExploded[0]; + $entityId = intval($stringExploded[1]); + + + try { + $parent = $this->entityRepo->getById($entityType, $entityId); + } catch (\Exception $e) { + session()->flash(trans('entities.selected_book_chapter_not_found')); + return redirect()->back(); + } + + $this->entityRepo->changePageParent($page, $parent); + Activity::add($page, 'page_move', $page->book->id); + session()->flash('success', trans('entities.pages_move_success', ['parentName' => $parent->name])); + + return redirect($page->getUrl()); + } + + /** + * Set the permissions for this page. + * @param string $bookSlug + * @param string $pageSlug * @param Request $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function restrict($bookSlug, $pageSlug, Request $request) { - $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $this->checkOwnablePermission('restrictions-manage', $page); - $this->pageRepo->updateRestrictionsFromRequest($request, $page); - session()->flash('success', 'Page Restrictions Updated'); + $this->entityRepo->updateEntityPermissionsFromRequest($request, $page); + session()->flash('success', trans('entities.pages_permissions_success')); return redirect($page->getUrl()); }