Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-23 19:32:29 +01:00
Code Issues Releases Wiki Activity

Merge branch 'feature/sort-shelf-books' of git://github.com/guillaumehanotel/BookStack into guillaumehanotel-feature/sort-shelf-books

Browse Source
This commit is contained in:
Dan Brown 2021-03-21 21:52:39 +00:00
commit ab4c5a55b8
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/BookshelfController.php
View File

@ -101,6 +101,15 @@ class BookshelfController extends Controller
$shelf = $this->bookshelfRepo->getBySlug($slug);
$this->checkOwnablePermission('book-view', $shelf);
$sort = setting()->getForCurrentUser('shelf_books_sort', 'name');
$order = setting()->getForCurrentUser('shelf_books_sort_order', 'asc');
$visibleShelfBooks = $shelf->visibleBooks()->get();
$sortedVisibleShelfBooks = $visibleShelfBooks
->sortBy($sort, SORT_REGULAR, $order === 'desc')
->values()
->all();
Views::add($shelf);
$this->entityContextManager->setShelfContext($shelf->id);
$view = setting()->getForCurrentUser('bookshelf_view_type');
@ -108,8 +117,11 @@ class BookshelfController extends Controller
$this->setPageTitle($shelf->getShortName());
return view('shelves.show', [
'shelf' => $shelf,
'sortedVisibleShelfBooks' => $sortedVisibleShelfBooks,
'view' => $view,
'activity' => Activity::entityActivity($shelf, 20, 1)
'activity' => Activity::entityActivity($shelf, 20, 1),
'order' => $order,
'sort' => $sort
]);
}

2
app/Http/Controllers/UserController.php
View File

@ -300,7 +300,7 @@ class UserController extends Controller
*/
public function changeSort(Request $request, string $id, string $type)
{
$validSortTypes = ['books', 'bookshelves'];
$validSortTypes = ['books', 'bookshelves', 'shelf_books'];
if (!in_array($type, $validSortTypes)) {
return redirect()->back(500);
}

19
resources/views/shelves/show.blade.php
View File

@ -9,19 +9,30 @@
</div>
<main class="card content-wrap">
<h1 class="break-text">{{$shelf->name}}</h1>
<div class="grid half v-center">
<h1 class="break-text">{{$shelf->name}}</h1>
<div class="text-m-right my-m">
@include('partials.sort', ['options' => [
'name' => trans('common.sort_name'),
'created_at' => trans('common.sort_created_at'),
'updated_at' => trans('common.sort_updated_at'),
], 'order' => $order, 'sort' => $sort, 'type' => 'shelf_books'])
</div>
</div>
<div class="book-content">
<p class="text-muted">{!! nl2br(e($shelf->description)) !!}</p>
@if(count($shelf->visibleBooks) > 0)
@if(count($sortedVisibleShelfBooks) > 0)
@if($view === 'list')
<div class="entity-list">
@foreach($shelf->visibleBooks as $book)
@foreach($sortedVisibleShelfBooks as $book)
@include('books.list-item', ['book' => $book])
@endforeach
</div>
@else
<div class="grid third">
@foreach($shelf->visibleBooks as $key => $book)
@foreach($sortedVisibleShelfBooks as $key => $book)
@include('partials.entity-grid-item', ['entity' => $book])
@endforeach
</div>