WYSWIYG: Allowed video/embed alignment controls

[bookstack] / app / Entities / Controllers / ChapterController.php

diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 7dcb669038bca6d770c59b1da206a4f3a74c8afe..40a5373031733aa0b4bf1acfbbe95053afe01e72 100644 (file)
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\Models\View;
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\Models\View;

+use BookStack\Activity\Tools\UserEntityWatchOptions;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Tools\BookContents;


@@ -11,6 +12,7 @@ use BookStack\Entities\Tools\HierarchyTransformer;
 use BookStack\Entities\Tools\NextPreviousContentLocator;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Entities\Tools\NextPreviousContentLocator;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;

+use BookStack\Exceptions\NotifyException;

 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;


@@ -81,6 +83,7 @@ class ChapterController extends Controller
             'chapter'        => $chapter,
             'current'        => $chapter,
             'sidebarTree'    => $sidebarTree,
             'chapter'        => $chapter,
             'current'        => $chapter,
             'sidebarTree'    => $sidebarTree,

+            'watchOptions'   => new UserEntityWatchOptions(user(), $chapter),

             'pages'          => $pages,
             'next'           => $nextPreviousLocator->getNext(),
             'previous'       => $nextPreviousLocator->getPrevious(),
             'pages'          => $pages,
             'next'           => $nextPreviousLocator->getNext(),
             'previous'       => $nextPreviousLocator->getPrevious(),


@@ -168,7 +171,7 @@ class ChapterController extends Controller
     /**
      * Perform the move action for a chapter.
      *
     /**
      * Perform the move action for a chapter.
      *

-     * @throws NotFoundException
+     * @throws NotFoundException|NotifyException

      */
     public function move(Request $request, string $bookSlug, string $chapterSlug)
     {
      */
     public function move(Request $request, string $bookSlug, string $chapterSlug)
     {


@@ -182,13 +185,13 @@ class ChapterController extends Controller
         }
 
         try {
         }
 
         try {

-            $newBook = $this->chapterRepo->move($chapter, $entitySelection);
+            $this->chapterRepo->move($chapter, $entitySelection);

         } catch (PermissionsException $exception) {
             $this->showPermissionError();
         } catch (MoveOperationException $exception) {
             $this->showErrorNotification(trans('errors.selected_book_not_found'));
 
         } catch (PermissionsException $exception) {
             $this->showPermissionError();
         } catch (MoveOperationException $exception) {
             $this->showErrorNotification(trans('errors.selected_book_not_found'));
 

-            return redirect()->back();
+            return redirect($chapter->getUrl('/move'));

         }
 
         return redirect($chapter->getUrl());
         }
 
         return redirect($chapter->getUrl());


@@ -229,7 +232,7 @@ class ChapterController extends Controller
         if (is_null($newParentBook)) {
             $this->showErrorNotification(trans('errors.selected_book_not_found'));
 
         if (is_null($newParentBook)) {
             $this->showErrorNotification(trans('errors.selected_book_not_found'));
 

-            return redirect()->back();
+            return redirect($chapter->getUrl('/copy'));

         }
 
         $this->checkOwnablePermission('chapter-create', $newParentBook);
         }
 
         $this->checkOwnablePermission('chapter-create', $newParentBook);