archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-18 14:21:05 +00:00
Code Issues Projects Releases Wiki Activity

Moved shelf book append logic

Browse source
This commit is contained in:
Dan Brown 2019-09-19 18:20:09 +01:00
parent 615b2de433
commit f7a5a0705b
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
3 changed files with 18 additions and 20 deletions
app/Http/Controllers
BookController.php

7
app/Http/Controllers/BookController.php
View file

@ -3,10 +3,9 @@
use Activity;
use BookStack\Auth\UserRepo;
use BookStack\Entities\Book;
use BookStack\Entities\Bookshelf;
use BookStack\Entities\EntityContextManager;
use BookStack\Entities\Repos\BookRepo;
use BookStack\Entities\Repos\EntityRepo;
use BookStack\Entities\ExportService;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Exceptions\NotFoundException;
use BookStack\Exceptions\NotifyException;
@ -121,16 +120,18 @@ class BookController extends Controller
$bookshelf = null;
if ($shelfSlug !== null) {
/** @var Bookshelf $bookshelf */
$bookshelf = $this->bookRepo->getEntityBySlug('bookshelf', $shelfSlug);
$this->checkOwnablePermission('bookshelf-update', $bookshelf);
}
/** @var Book $book */
$book = $this->bookRepo->createFromInput('book', $request->all());
$this->bookUpdateActions($book, $request);
Activity::add($book, 'book_create', $book->id);
if ($bookshelf) {
$this->bookRepo->appendBookToShelf($bookshelf, $book);
$bookshelf->appendBook($book);
Activity::add($bookshelf, 'bookshelf_update');
}