X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..00eedafbfdf2e60c7ffebb7e7ccf2a65ffa75b51:/app/Http/Controllers/BookSortController.php diff --git a/app/Http/Controllers/BookSortController.php b/app/Http/Controllers/BookSortController.php index 6d3199cbe..010e74fa4 100644 --- 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\Entities\Tools\BookContents; 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 { - 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()])); + 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(); - 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) { - Activity::addForEntity($book, ActivityType::BOOK_SORT); + Activity::add(ActivityType::BOOK_SORT, $book); }); return redirect($book->getUrl());