From 4ad4dfa55ae75e3e4ebd0537a44c5d0c758636cc Mon Sep 17 00:00:00 2001
From: Christopher Wilkinson <christopher@cw1998.uk>
Date: Fri, 27 Sep 2019 00:45:10 +0100
Subject: [PATCH] Show bookshelves that a book belongs to on a book view
Closes #1598
---
app/Entities/Repos/EntityRepo.php | 11 ++++++++++
app/Http/Controllers/BookController.php | 2 ++
resources/lang/en/entities.php | 1 +
resources/views/books/show.blade.php | 13 +++++++++---
tests/Entity/BookShelfTest.php | 28 +++++++++++++++++++++++++
5 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/app/Entities/Repos/EntityRepo.php b/app/Entities/Repos/EntityRepo.php
index 13a335ea0..0dd0fbb0a 100644
--- a/app/Entities/Repos/EntityRepo.php
+++ b/app/Entities/Repos/EntityRepo.php
@@ -413,6 +413,17 @@ class EntityRepo
return collect($tree);
}
+
+ /**
+ * Get the bookshelves that a book is contained in.
+ * @param Book $book
+ * @return \Illuminate\Database\Eloquent\Collection|static[]
+ */
+ public function getBookParentShelves(Book $book)
+ {
+ return $this->permissionService->enforceEntityRestrictions('shelf', $book->shelves())->get();
+ }
+
/**
* Get the child items for a chapter sorted by priority but
* with draft items floated to the top.
diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index a9a24d2ff..35f62012a 100644
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -150,6 +150,7 @@ class BookController extends Controller
$this->checkOwnablePermission('book-view', $book);
$bookChildren = $this->bookRepo->getBookChildren($book);
+ $bookParentShelves = $this->bookRepo->getBookParentShelves($book);
Views::add($book);
if ($request->has('shelf')) {
@@ -161,6 +162,7 @@ class BookController extends Controller
'book' => $book,
'current' => $book,
'bookChildren' => $bookChildren,
+ 'bookParentShelves' => $bookParentShelves,
'activity' => Activity::entityActivity($book, 20, 1)
]);
}
diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index 6bbc723b0..79e640378 100644
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -135,6 +135,7 @@ return [
'books_sort_chapters_last' => 'Chapters Last',
'books_sort_show_other' => 'Show Other Books',
'books_sort_save' => 'Save New Order',
+ 'book_parent_shelves_empty' => 'Shelves that this book is on will appear here.',
// Chapters
'chapter' => 'Chapter',
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index cbafdb436..41581e123 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -57,9 +57,7 @@
@stop
-
@section('right')
-
<div class="mb-xl">
<h5>{{ trans('common.details') }}</h5>
<div class="text-small text-muted blended-links">
@@ -76,7 +74,6 @@
</div>
</div>
-
<div class="actions mb-xl">
<h5>{{ trans('common.actions') }}</h5>
<div class="icon-list text-primary">
@@ -125,6 +122,16 @@
</div>
</div>
+ <div class="actions mb-xl">
+ <h5>{{ trans('entities.shelves_long') }}</h5>
+
+ @if(count($bookParentShelves) > 0)
+ @include('partials.entity-list', ['entities' => $bookParentShelves, 'style' => 'compact'])
+ @else
+ <div class="body text-muted">{{ trans('entities.book_parent_shelves_empty') }}</div>
+ @endif
+ </div>
+
@stop
@section('left')
diff --git a/tests/Entity/BookShelfTest.php b/tests/Entity/BookShelfTest.php
index 5c7673847..88358405f 100644
--- a/tests/Entity/BookShelfTest.php
+++ b/tests/Entity/BookShelfTest.php
@@ -240,4 +240,32 @@ class BookShelfTest extends TestCase
$pageVisit->assertElementNotContains('.breadcrumbs', $shelf->getShortName());
}
+ public function test_bookshelves_show_on_book()
+ {
+ // Create shelf
+ $shelfInfo = [
+ 'name' => 'My test shelf' . Str::random(4),
+ 'description' => 'Test shelf description ' . Str::random(10)
+ ];
+
+ $this->asEditor()->post('/shelves', $shelfInfo);
+ $shelf = Bookshelf::where('name', '=', $shelfInfo['name'])->first();
+
+ // Create book and add to shelf
+ $this->asEditor()->post($shelf->getUrl('/create-book'), [
+ 'name' => 'Test book name',
+ 'description' => 'Book in shelf description'
+ ]);
+
+ $newBook = Book::query()->orderBy('id', 'desc')->first();
+
+ $resp = $this->asEditor()->get($newBook->getUrl());
+ $resp->assertSee($shelfInfo['name']);
+
+ // Remove shelf
+ $this->delete($shelf->getUrl());
+
+ $resp = $this->asEditor()->get($newBook->getUrl());
+ $resp->assertDontSee($shelfInfo['name']);
+ }
}