Fixed failing webhook test cases

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

diff --git a/app/Http/Controllers/BookSortController.php b/app/Http/Controllers/BookSortController.php
index 6d3199cbee990fe90b484c2b3a3bc6d4c73a54b8..010e74fa4ffa2434668cfbed8ac181245c1ed95e 100644 (file)
--- a/app/Http/Controllers/BookSortController.php
+++ b/app/Http/Controllers/BookSortController.php
@@ -4,15 +4,14 @@ namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Entities\Models\Book;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Entities\Models\Book;

-use BookStack\Entities\Tools\BookContents;

 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookRepo;

+use BookStack\Entities\Tools\BookContents;

 use BookStack\Exceptions\SortOperationException;
 use BookStack\Facades\Activity;
 use Illuminate\Http\Request;
 
 class BookSortController extends Controller
 {
 use BookStack\Exceptions\SortOperationException;
 use BookStack\Facades\Activity;
 use Illuminate\Http\Request;
 
 class BookSortController extends Controller
 {

-

     protected $bookRepo;
 
     public function __construct(BookRepo $bookRepo)
     protected $bookRepo;
 
     public function __construct(BookRepo $bookRepo)


@@ -31,6 +30,7 @@ class BookSortController extends Controller
         $bookChildren = (new BookContents($book))->getTree(false);
 
         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
         $bookChildren = (new BookContents($book))->getTree(false);
 
         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));

+

         return view('books.sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
     }
 
         return view('books.sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
     }
 


@@ -42,7 +42,8 @@ class BookSortController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $bookChildren = (new BookContents($book))->getTree();
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $bookChildren = (new BookContents($book))->getTree();

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

     }
 
     /**
     }
 
     /**


@@ -70,7 +71,7 @@ class BookSortController extends Controller
 
         // Rebuild permissions and add activity for involved books.
         $booksInvolved->each(function (Book $book) {
 
         // Rebuild permissions and add activity for involved books.
         $booksInvolved->each(function (Book $book) {

-            Activity::addForEntity($book, ActivityType::BOOK_SORT);
+            Activity::add(ActivityType::BOOK_SORT, $book);

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