X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/40ca50e44f3ca0f648d915dc73ff205309730f07..refs/pull/2935/head:/app/Http/Controllers/ChapterController.php diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php index d65b43cc1..b27fb4f77 100644 --- a/app/Http/Controllers/ChapterController.php +++ b/app/Http/Controllers/ChapterController.php @@ -1,9 +1,11 @@ -checkOwnablePermission('chapter-create', $book); $this->setPageTitle(trans('entities.chapters_create')); + return view('chapters.create', ['book' => $book, 'current' => $book]); } /** * Store a newly created chapter in storage. + * * @throws ValidationException */ public function store(Request $request, string $bookSlug) { $this->validate($request, [ - 'name' => 'required|string|max:255' + 'name' => 'required|string|max:255', ]); $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail(); @@ -69,14 +72,15 @@ class ChapterController extends Controller View::incrementFor($chapter); $this->setPageTitle($chapter->getShortName()); + return view('chapters.show', [ - 'book' => $chapter->book, - 'chapter' => $chapter, - 'current' => $chapter, + 'book' => $chapter->book, + 'chapter' => $chapter, + 'current' => $chapter, 'sidebarTree' => $sidebarTree, - 'pages' => $pages, - 'next' => $nextPreviousLocator->getNext(), - 'previous' => $nextPreviousLocator->getPrevious(), + 'pages' => $pages, + 'next' => $nextPreviousLocator->getNext(), + 'previous' => $nextPreviousLocator->getPrevious(), ]); } @@ -89,11 +93,13 @@ class ChapterController extends Controller $this->checkOwnablePermission('chapter-update', $chapter); $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()])); + return view('chapters.edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); } /** * Update the specified chapter in storage. + * * @throws NotFoundException */ public function update(Request $request, string $bookSlug, string $chapterSlug) @@ -108,6 +114,7 @@ class ChapterController extends Controller /** * Shows the page to confirm deletion of this chapter. + * * @throws NotFoundException */ public function showDelete(string $bookSlug, string $chapterSlug) @@ -116,11 +123,13 @@ class ChapterController extends Controller $this->checkOwnablePermission('chapter-delete', $chapter); $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()])); + return view('chapters.delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); } /** * Remove the specified chapter from storage. + * * @throws NotFoundException * @throws Throwable */ @@ -136,6 +145,7 @@ class ChapterController extends Controller /** * Show the page for moving a chapter. + * * @throws NotFoundException */ public function showMove(string $bookSlug, string $chapterSlug) @@ -147,12 +157,13 @@ class ChapterController extends Controller return view('chapters.move', [ 'chapter' => $chapter, - 'book' => $chapter->book + 'book' => $chapter->book, ]); } /** * Perform the move action for a chapter. + * * @throws NotFoundException */ public function move(Request $request, string $bookSlug, string $chapterSlug) @@ -170,15 +181,18 @@ class ChapterController extends Controller $newBook = $this->chapterRepo->move($chapter, $entitySelection); } catch (MoveOperationException $exception) { $this->showErrorNotification(trans('errors.selected_book_not_found')); + return redirect()->back(); } $this->showSuccessNotification(trans('entities.chapter_move_success', ['bookName' => $newBook->name])); + return redirect($chapter->getUrl()); } /** * Show the Restrictions view. + * * @throws NotFoundException */ public function showPermissions(string $bookSlug, string $chapterSlug) @@ -193,6 +207,7 @@ class ChapterController extends Controller /** * Set the restrictions for this chapter. + * * @throws NotFoundException */ public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug, string $chapterSlug) @@ -203,6 +218,7 @@ class ChapterController extends Controller $permissionsUpdater->updateFromPermissionsForm($chapter, $request); $this->showSuccessNotification(trans('entities.chapters_permissions_success')); + return redirect($chapter->getUrl()); } }