ZIP Import: Added upload handling

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

diff --git a/app/Entities/Controllers/BookSortController.php b/app/Entities/Controllers/BookSortController.php
index f2310e2055dd24f76301eec1abd4ac0859c2a483..5aefc583279dbdf7f97cb42122f1af52cf6489a5 100644 (file)
--- a/app/Entities/Controllers/BookSortController.php
+++ b/app/Entities/Controllers/BookSortController.php
@@ -3,7 +3,7 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\ActivityType;
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\ActivityType;

-use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Queries\BookQueries;

 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\BookSortMap;
 use BookStack\Facades\Activity;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\BookSortMap;
 use BookStack\Facades\Activity;


@@ -12,11 +12,9 @@ use Illuminate\Http\Request;
 
 class BookSortController extends Controller
 {
 
 class BookSortController extends Controller
 {

-    protected $bookRepo;
-
-    public function __construct(BookRepo $bookRepo)
-    {
-        $this->bookRepo = $bookRepo;
+    public function __construct(
+        protected BookQueries $queries,
+    ) {

     }
 
     /**
     }
 
     /**


@@ -24,7 +22,7 @@ class BookSortController extends Controller
      */
     public function show(string $bookSlug)
     {
      */
     public function show(string $bookSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);

         $this->checkOwnablePermission('book-update', $book);
 
         $bookChildren = (new BookContents($book))->getTree(false);
         $this->checkOwnablePermission('book-update', $book);
 
         $bookChildren = (new BookContents($book))->getTree(false);


@@ -40,7 +38,7 @@ class BookSortController extends Controller
      */
     public function showItem(string $bookSlug)
     {
      */
     public function showItem(string $bookSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);

         $bookChildren = (new BookContents($book))->getTree();
 
         return view('books.parts.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
         $bookChildren = (new BookContents($book))->getTree();
 
         return view('books.parts.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);


@@ -51,7 +49,7 @@ class BookSortController extends Controller
      */
     public function update(Request $request, string $bookSlug)
     {
      */
     public function update(Request $request, string $bookSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);

         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent