X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/da1cea06ca5db56a9635bf8bb01da2516d601620..refs/pull/2716/head:/app/Http/Controllers/BookController.php diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php index 1643c62f9..59c205d0a 100644 --- a/app/Http/Controllers/BookController.php +++ b/app/Http/Controllers/BookController.php @@ -1,12 +1,13 @@ bookRepo = $bookRepo; $this->entityContextManager = $entityContextManager; - parent::__construct(); } /** @@ -33,7 +30,7 @@ class BookController extends Controller */ public function index() { - $view = setting()->getForCurrentUser('books_view_type', config('app.views.books')); + $view = setting()->getForCurrentUser('books_view_type'); $sort = setting()->getForCurrentUser('books_sort', 'name'); $order = setting()->getForCurrentUser('books_sort_order', 'asc'); @@ -97,11 +94,10 @@ class BookController extends Controller $book = $this->bookRepo->create($request->all()); $this->bookRepo->updateCoverImage($book, $request->file('image', null)); - Activity::add($book, 'book_create', $book->id); if ($bookshelf) { $bookshelf->appendBook($book); - Activity::add($bookshelf, 'bookshelf_update'); + Activity::addForEntity($bookshelf, ActivityType::BOOKSHELF_UPDATE); } return redirect($book->getUrl()); @@ -162,8 +158,6 @@ class BookController extends Controller $resetCover = $request->has('image_reset'); $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover); - Activity::add($book, 'book_update', $book->id); - return redirect($book->getUrl()); } @@ -181,14 +175,12 @@ class BookController extends Controller /** * Remove the specified book from the system. * @throws Throwable - * @throws NotifyException */ public function destroy(string $bookSlug) { $book = $this->bookRepo->getBySlug($bookSlug); $this->checkOwnablePermission('book-delete', $book); - Activity::addMessage('book_delete', $book->name); $this->bookRepo->destroy($book); return redirect('/books'); @@ -211,14 +203,12 @@ class BookController extends Controller * Set the restrictions for this book. * @throws Throwable */ - public function permissions(Request $request, string $bookSlug) + public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug) { $book = $this->bookRepo->getBySlug($bookSlug); $this->checkOwnablePermission('restrictions-manage', $book); - $restricted = $request->get('restricted') === 'true'; - $permissions = $request->filled('restrictions') ? collect($request->get('restrictions')) : null; - $this->bookRepo->updatePermissions($book, $restricted, $permissions); + $permissionsUpdater->updateFromPermissionsForm($book, $request); $this->showSuccessNotification(trans('entities.books_permissions_updated')); return redirect($book->getUrl());