Fixed OIDC Logout

[bookstack] / app / Entities / Tools / BookContents.php

diff --git a/app/Entities/Tools/BookContents.php b/app/Entities/Tools/BookContents.php
index 6f11e8cbe528f3002008f8a03d78248d0f3fdb0d..f45bdfcc1b98fabcdb2d4dc774c30752a7582ef1 100644 (file)
--- a/app/Entities/Tools/BookContents.php
+++ b/app/Entities/Tools/BookContents.php
@@ -11,22 +11,15 @@ use Illuminate\Support\Collection;
 
 class BookContents
 {
 
 class BookContents
 {

-    /**
-     * @var Book
-     */
-    protected $book;
+    protected Book $book;

 
 

-    /**
-     * BookContents constructor.
-     */

     public function __construct(Book $book)
     {
         $this->book = $book;
     }
 
     /**
     public function __construct(Book $book)
     {
         $this->book = $book;
     }
 
     /**

-     * Get the current priority of the last item
-     * at the top-level of the book.
+     * Get the current priority of the last item at the top-level of the book.

      */
     public function getLastPriority(): int
     {
      */
     public function getLastPriority(): int
     {


@@ -188,7 +181,7 @@ class BookContents
             $model->changeBook($newBook->id);
         }
 
             $model->changeBook($newBook->id);
         }
 

-        if ($chapterChanged) {
+        if ($model instanceof Page && $chapterChanged) {

             $model->chapter_id = $newChapter->id ?? 0;
         }
 
             $model->chapter_id = $newChapter->id ?? 0;
         }
 


@@ -242,7 +235,7 @@ class BookContents
             }
 
             $hasPageEditPermission = userCan('page-update', $model);
             }
 
             $hasPageEditPermission = userCan('page-update', $model);

-            $newParentInRightLocation = ($newParent instanceof Book || $newParent->book_id === $newBook->id);
+            $newParentInRightLocation = ($newParent instanceof Book || ($newParent instanceof Chapter && $newParent->book_id === $newBook->id));

             $newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';
             $hasNewParentPermission = userCan($newParentPermission, $newParent);
 
             $newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';
             $hasNewParentPermission = userCan($newParentPermission, $newParent);