mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-05-22 14:49:59 +08:00
Added bookshelf view, update, delete
- Enabled proper ordering of Books in a shelf. - Improved related item destroy for all entities.
This commit is contained in:
Dan Brown
@ -2,6 +2,7 @@
|
||||
|
||||
use Activity;
|
||||
use BookStack\Book;
|
||||
use BookStack\Bookshelf;
|
||||
use BookStack\Repos\EntityRepo;
|
||||
use BookStack\Repos\UserRepo;
|
||||
use BookStack\Services\ExportService;
|
||||
@ -41,6 +42,7 @@ class BookshelfController extends Controller
|
||||
$popular = $this->entityRepo->getPopular('bookshelf', 4, 0);
|
||||
$new = $this->entityRepo->getRecentlyCreated('bookshelf', 4, 0);
|
||||
$shelvesViewType = setting()->getUser($this->currentUser, 'bookshelves_view_type', config('app.views.bookshelves', 'grid'));
|
||||
|
||||
$this->setPageTitle(trans('entities.shelves'));
|
||||
return view('shelves/index', [
|
||||
'shelves' => $shelves,
|
||||
@ -58,13 +60,13 @@ class BookshelfController extends Controller
|
||||
public function create()
|
||||
{
|
||||
$this->checkPermission('bookshelf-create-all');
|
||||
$this->setPageTitle(trans('entities.shelves_create'));
|
||||
$books = $this->entityRepo->getAll('book', false, 'update');
|
||||
$this->setPageTitle(trans('entities.shelves_create'));
|
||||
return view('shelves/create', ['books' => $books]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created book in storage.
|
||||
* Store a newly created bookshelf in storage.
|
||||
* @param Request $request
|
||||
* @return Response
|
||||
*/
|
||||
@ -83,184 +85,110 @@ class BookshelfController extends Controller
|
||||
return redirect($bookshelf->getUrl());
|
||||
}
|
||||
|
||||
//
|
||||
// /**
|
||||
// * Display the specified book.
|
||||
// * @param $slug
|
||||
// * @return Response
|
||||
// */
|
||||
// public function show($slug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $slug);
|
||||
// $this->checkOwnablePermission('book-view', $book);
|
||||
// $bookChildren = $this->entityRepo->getBookChildren($book);
|
||||
// Views::add($book);
|
||||
// $this->setPageTitle($book->getShortName());
|
||||
// return view('books/show', [
|
||||
// 'book' => $book,
|
||||
// 'current' => $book,
|
||||
// 'bookChildren' => $bookChildren,
|
||||
// 'activity' => Activity::entityActivity($book, 20, 0)
|
||||
// ]);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Show the form for editing the specified book.
|
||||
// * @param $slug
|
||||
// * @return Response
|
||||
// */
|
||||
// public function edit($slug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $slug);
|
||||
// $this->checkOwnablePermission('book-update', $book);
|
||||
// $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
|
||||
// return view('books/edit', ['book' => $book, 'current' => $book]);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Update the specified book in storage.
|
||||
// * @param Request $request
|
||||
// * @param $slug
|
||||
// * @return Response
|
||||
// */
|
||||
// public function update(Request $request, $slug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $slug);
|
||||
// $this->checkOwnablePermission('book-update', $book);
|
||||
// $this->validate($request, [
|
||||
// 'name' => 'required|string|max:255',
|
||||
// 'description' => 'string|max:1000'
|
||||
// ]);
|
||||
// $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
|
||||
// Activity::add($book, 'book_update', $book->id);
|
||||
// return redirect($book->getUrl());
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Shows the page to confirm deletion
|
||||
// * @param $bookSlug
|
||||
// * @return \Illuminate\View\View
|
||||
// */
|
||||
// public function showDelete($bookSlug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $this->checkOwnablePermission('book-delete', $book);
|
||||
// $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));
|
||||
// return view('books/delete', ['book' => $book, 'current' => $book]);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Shows the view which allows pages to be re-ordered and sorted.
|
||||
// * @param string $bookSlug
|
||||
// * @return \Illuminate\View\View
|
||||
// */
|
||||
// public function sort($bookSlug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $this->checkOwnablePermission('book-update', $book);
|
||||
// $bookChildren = $this->entityRepo->getBookChildren($book, true);
|
||||
// $books = $this->entityRepo->getAll('book', false, 'update');
|
||||
// $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
|
||||
// return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Shows the sort box for a single book.
|
||||
// * Used via AJAX when loading in extra books to a sort.
|
||||
// * @param $bookSlug
|
||||
// * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
// */
|
||||
// public function getSortItem($bookSlug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $bookChildren = $this->entityRepo->getBookChildren($book);
|
||||
// return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Saves an array of sort mapping to pages and chapters.
|
||||
// * @param string $bookSlug
|
||||
// * @param Request $request
|
||||
// * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
// */
|
||||
// public function saveSort($bookSlug, Request $request)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $this->checkOwnablePermission('book-update', $book);
|
||||
//
|
||||
// // Return if no map sent
|
||||
// if (!$request->filled('sort-tree')) {
|
||||
// return redirect($book->getUrl());
|
||||
// }
|
||||
//
|
||||
// // Sort pages and chapters
|
||||
// $sortMap = collect(json_decode($request->get('sort-tree')));
|
||||
// $bookIdsInvolved = collect([$book->id]);
|
||||
//
|
||||
// // Load models into map
|
||||
// $sortMap->each(function ($mapItem) use ($bookIdsInvolved) {
|
||||
// $mapItem->type = ($mapItem->type === 'page' ? 'page' : 'chapter');
|
||||
// $mapItem->model = $this->entityRepo->getById($mapItem->type, $mapItem->id);
|
||||
// // Store source and target books
|
||||
// $bookIdsInvolved->push(intval($mapItem->model->book_id));
|
||||
// $bookIdsInvolved->push(intval($mapItem->book));
|
||||
// });
|
||||
//
|
||||
// // Get the books involved in the sort
|
||||
// $bookIdsInvolved = $bookIdsInvolved->unique()->toArray();
|
||||
// $booksInvolved = $this->entityRepo->book->newQuery()->whereIn('id', $bookIdsInvolved)->get();
|
||||
// // Throw permission error if invalid ids or inaccessible books given.
|
||||
// if (count($bookIdsInvolved) !== count($booksInvolved)) {
|
||||
// $this->showPermissionError();
|
||||
// }
|
||||
// // Check permissions of involved books
|
||||
// $booksInvolved->each(function (Book $book) {
|
||||
// $this->checkOwnablePermission('book-update', $book);
|
||||
// });
|
||||
//
|
||||
// // Perform the sort
|
||||
// $sortMap->each(function ($mapItem) {
|
||||
// $model = $mapItem->model;
|
||||
//
|
||||
// $priorityChanged = intval($model->priority) !== intval($mapItem->sort);
|
||||
// $bookChanged = intval($model->book_id) !== intval($mapItem->book);
|
||||
// $chapterChanged = ($mapItem->type === 'page') && intval($model->chapter_id) !== $mapItem->parentChapter;
|
||||
//
|
||||
// if ($bookChanged) {
|
||||
// $this->entityRepo->changeBook($mapItem->type, $mapItem->book, $model);
|
||||
// }
|
||||
// if ($chapterChanged) {
|
||||
// $model->chapter_id = intval($mapItem->parentChapter);
|
||||
// $model->save();
|
||||
// }
|
||||
// if ($priorityChanged) {
|
||||
// $model->priority = intval($mapItem->sort);
|
||||
// $model->save();
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// // Rebuild permissions and add activity for involved books.
|
||||
// $booksInvolved->each(function (Book $book) {
|
||||
// $this->entityRepo->buildJointPermissionsForBook($book);
|
||||
// Activity::add($book, 'book_sort', $book->id);
|
||||
// });
|
||||
//
|
||||
// return redirect($book->getUrl());
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Remove the specified book from storage.
|
||||
// * @param $bookSlug
|
||||
// * @return Response
|
||||
// */
|
||||
// public function destroy($bookSlug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $this->checkOwnablePermission('book-delete', $book);
|
||||
// Activity::addMessage('book_delete', 0, $book->name);
|
||||
// $this->entityRepo->destroyBook($book);
|
||||
// return redirect('/books');
|
||||
// }
|
||||
|
||||
/**
|
||||
* Display the specified bookshelf.
|
||||
* @param String $slug
|
||||
* @return Response
|
||||
* @throws \BookStack\Exceptions\NotFoundException
|
||||
*/
|
||||
public function show(string $slug)
|
||||
{
|
||||
$bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
|
||||
$this->checkOwnablePermission('book-view', $bookshelf);
|
||||
|
||||
$books = $this->entityRepo->getBookshelfChildren($bookshelf);
|
||||
Views::add($bookshelf);
|
||||
|
||||
$this->setPageTitle($bookshelf->getShortName());
|
||||
return view('shelves/show', [
|
||||
'shelf' => $bookshelf,
|
||||
'books' => $books,
|
||||
'activity' => Activity::entityActivity($bookshelf, 20, 0)
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified bookshelf.
|
||||
* @param $slug
|
||||
* @return Response
|
||||
* @throws \BookStack\Exceptions\NotFoundException
|
||||
*/
|
||||
public function edit(string $slug)
|
||||
{
|
||||
$bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
|
||||
$this->checkOwnablePermission('bookshelf-update', $bookshelf);
|
||||
|
||||
$shelfBooks = $this->entityRepo->getBookshelfChildren($bookshelf);
|
||||
$shelfBookIds = $shelfBooks->pluck('id');
|
||||
$books = $this->entityRepo->getAll('book', false, 'update');
|
||||
$books = $books->filter(function ($book) use ($shelfBookIds) {
|
||||
return !$shelfBookIds->contains($book->id);
|
||||
});
|
||||
|
||||
$this->setPageTitle(trans('entities.shelves_edit_named', ['name' => $bookshelf->getShortName()]));
|
||||
return view('shelves/edit', [
|
||||
'shelf' => $bookshelf,
|
||||
'books' => $books,
|
||||
'shelfBooks' => $shelfBooks,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update the specified bookshelf in storage.
|
||||
* @param Request $request
|
||||
* @param string $slug
|
||||
* @return Response
|
||||
* @throws \BookStack\Exceptions\NotFoundException
|
||||
*/
|
||||
public function update(Request $request, string $slug)
|
||||
{
|
||||
$shelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
|
||||
$this->checkOwnablePermission('bookshelf-update', $shelf);
|
||||
$this->validate($request, [
|
||||
'name' => 'required|string|max:255',
|
||||
'description' => 'string|max:1000',
|
||||
]);
|
||||
|
||||
$shelf = $this->entityRepo->updateFromInput('bookshelf', $shelf, $request->all());
|
||||
$this->entityRepo->updateShelfBooks($shelf, $request->get('books', ''));
|
||||
Activity::add($shelf, 'bookshelf_update');
|
||||
|
||||
return redirect($shelf->getUrl());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Shows the page to confirm deletion
|
||||
* @param $slug
|
||||
* @return \Illuminate\View\View
|
||||
* @throws \BookStack\Exceptions\NotFoundException
|
||||
*/
|
||||
public function showDelete(string $slug)
|
||||
{
|
||||
$bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
|
||||
$this->checkOwnablePermission('bookshelf-delete', $bookshelf);
|
||||
|
||||
$this->setPageTitle(trans('entities.shelves_delete_named', ['name' => $bookshelf->getShortName()]));
|
||||
return view('shelves/delete', ['shelf' => $bookshelf]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified bookshelf from storage.
|
||||
* @param string $slug
|
||||
* @return Response
|
||||
* @throws \BookStack\Exceptions\NotFoundException
|
||||
* @throws \Throwable
|
||||
*/
|
||||
public function destroy(string $slug)
|
||||
{
|
||||
$bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
|
||||
$this->checkOwnablePermission('bookshelf-delete', $bookshelf);
|
||||
Activity::addMessage('bookshelf_delete', 0, $bookshelf->name);
|
||||
$this->entityRepo->destroyBookshelf($bookshelf);
|
||||
return redirect('/shelves');
|
||||
}
|
||||
//
|
||||
// /**
|
||||
// * Show the Restrictions view.
|
||||
@ -293,49 +221,5 @@ class BookshelfController extends Controller
|
||||
// session()->flash('success', trans('entities.books_permissions_updated'));
|
||||
// return redirect($book->getUrl());
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Export a book as a PDF file.
|
||||
// * @param string $bookSlug
|
||||
// * @return mixed
|
||||
// */
|
||||
// public function exportPdf($bookSlug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $pdfContent = $this->exportService->bookToPdf($book);
|
||||
// return response()->make($pdfContent, 200, [
|
||||
// 'Content-Type' => 'application/octet-stream',
|
||||
// 'Content-Disposition' => 'attachment; filename="' . $bookSlug . '.pdf'
|
||||
// ]);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Export a book as a contained HTML file.
|
||||
// * @param string $bookSlug
|
||||
// * @return mixed
|
||||
// */
|
||||
// public function exportHtml($bookSlug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $htmlContent = $this->exportService->bookToContainedHtml($book);
|
||||
// return response()->make($htmlContent, 200, [
|
||||
// 'Content-Type' => 'application/octet-stream',
|
||||
// 'Content-Disposition' => 'attachment; filename="' . $bookSlug . '.html'
|
||||
// ]);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Export a book as a plain text file.
|
||||
// * @param $bookSlug
|
||||
// * @return mixed
|
||||
// */
|
||||
// public function exportPlainText($bookSlug)
|
||||
// {
|
||||
// $book = $this->entityRepo->getBySlug('book', $bookSlug);
|
||||
// $htmlContent = $this->exportService->bookToPlainText($book);
|
||||
// return response()->make($htmlContent, 200, [
|
||||
// 'Content-Type' => 'application/octet-stream',
|
||||
// 'Content-Disposition' => 'attachment; filename="' . $bookSlug . '.txt'
|
||||
// ]);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user