X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/8c67011a1d1187f6300c19c3601ecd421fcf4f09..refs/pull/5591/head:/app/Entities/Tools/HierarchyTransformer.php diff --git a/app/Entities/Tools/HierarchyTransformer.php b/app/Entities/Tools/HierarchyTransformer.php index 93c5bb9bb..cd6c548fe 100644 --- a/app/Entities/Tools/HierarchyTransformer.php +++ b/app/Entities/Tools/HierarchyTransformer.php @@ -2,7 +2,7 @@ namespace BookStack\Entities\Tools; -use BookStack\Actions\ActivityType; +use BookStack\Activity\ActivityType; use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Bookshelf; use BookStack\Entities\Models\Chapter; @@ -45,6 +45,7 @@ class HierarchyTransformer $this->trashCan->destroyEntity($chapter); Activity::add(ActivityType::BOOK_CREATE_FROM_CHAPTER, $book); + return $book; } @@ -64,7 +65,7 @@ class HierarchyTransformer foreach ($book->chapters as $index => $chapter) { $newBook = $this->transformChapterToBook($chapter); $shelfBookSyncData[$newBook->id] = ['order' => $index]; - if (!$newBook->restricted) { + if (!$newBook->hasPermissions()) { $this->cloner->copyEntityPermissions($shelf, $newBook); } } @@ -80,6 +81,7 @@ class HierarchyTransformer $shelf->books()->sync($shelfBookSyncData); Activity::add(ActivityType::BOOKSHELF_CREATE_FROM_BOOK, $shelf); + return $shelf; } -} \ No newline at end of file +}