Added php8.2 to GH action checks

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index 5cd720f02b97ac360ad0fc65e4e61dcd38500c6a..4d2bcb2f1d444057daf8dff40fd4060bf7cf0fe4 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -7,24 +7,25 @@ use BookStack\Entities\Models\Book;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;

+use BookStack\Entities\Tools\HierarchyTransformer;

 use BookStack\Entities\Tools\NextPreviousContentLocator;
 use BookStack\Entities\Tools\NextPreviousContentLocator;

-use BookStack\Entities\Tools\PermissionsUpdater;

 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;

+use BookStack\Exceptions\PermissionsException;
+use BookStack\References\ReferenceFetcher;

 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 
 class ChapterController extends Controller
 {
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 
 class ChapterController extends Controller
 {

-    protected $chapterRepo;
+    protected ChapterRepo $chapterRepo;
+    protected ReferenceFetcher $referenceFetcher;

 
 

-    /**
-     * ChapterController constructor.
-     */
-    public function __construct(ChapterRepo $chapterRepo)
+    public function __construct(ChapterRepo $chapterRepo, ReferenceFetcher $referenceFetcher)

     {
         $this->chapterRepo = $chapterRepo;
     {
         $this->chapterRepo = $chapterRepo;

+        $this->referenceFetcher = $referenceFetcher;

     }
 
     /**
     }
 
     /**


@@ -75,13 +76,14 @@ class ChapterController extends Controller
         $this->setPageTitle($chapter->getShortName());
 
         return view('chapters.show', [
         $this->setPageTitle($chapter->getShortName());
 
         return view('chapters.show', [

-            'book'        => $chapter->book,
-            'chapter'     => $chapter,
-            'current'     => $chapter,
-            'sidebarTree' => $sidebarTree,
-            'pages'       => $pages,
-            'next'        => $nextPreviousLocator->getNext(),
-            'previous'    => $nextPreviousLocator->getPrevious(),
+            'book'           => $chapter->book,
+            'chapter'        => $chapter,
+            'current'        => $chapter,
+            'sidebarTree'    => $sidebarTree,
+            'pages'          => $pages,
+            'next'           => $nextPreviousLocator->getNext(),
+            'previous'       => $nextPreviousLocator->getPrevious(),
+            'referenceCount' => $this->referenceFetcher->getPageReferenceCountToEntity($chapter),

         ]);
     }
 
         ]);
     }
 


@@ -178,10 +180,10 @@ class ChapterController extends Controller
             return redirect($chapter->getUrl());
         }
 
             return redirect($chapter->getUrl());
         }
 

-        // TODO - Check permissions against pages
-

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

+        } catch (PermissionsException $exception) {
+            $this->showPermissionError();

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


@@ -241,34 +243,17 @@ class ChapterController extends Controller
     }
 
     /**
     }
 
     /**

-     * Show the Restrictions view.
-     *
-     * @throws NotFoundException
-     */
-    public function showPermissions(string $bookSlug, string $chapterSlug)
-    {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('restrictions-manage', $chapter);
-
-        return view('chapters.permissions', [
-            'chapter' => $chapter,
-        ]);
-    }
-
-    /**
-     * Set the restrictions for this chapter.
-     *
-     * @throws NotFoundException
+     * Convert the chapter to a book.

      */
      */

-    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug, string $chapterSlug)
+    public function convertToBook(HierarchyTransformer $transformer, string $bookSlug, string $chapterSlug)

     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

-        $this->checkOwnablePermission('restrictions-manage', $chapter);
-
-        $permissionsUpdater->updateFromPermissionsForm($chapter, $request);
+        $this->checkOwnablePermission('chapter-update', $chapter);
+        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkPermission('book-create-all');

 
 

-        $this->showSuccessNotification(trans('entities.chapters_permissions_success'));
+        $book = $transformer->transformChapterToBook($chapter);

 
 

-        return redirect($chapter->getUrl());
+        return redirect($book->getUrl());

     }
 }
     }
 }