mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 12:16:07 +00:00
Merge branch 'feature/sort-shelf-books' of git://github.com/guillaumehanotel/BookStack into guillaumehanotel-feature/sort-shelf-books
This commit is contained in:
commit
ab4c5a55b8
@ -101,6 +101,15 @@ class BookshelfController extends Controller
|
|||||||
$shelf = $this->bookshelfRepo->getBySlug($slug);
|
$shelf = $this->bookshelfRepo->getBySlug($slug);
|
||||||
$this->checkOwnablePermission('book-view', $shelf);
|
$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);
|
Views::add($shelf);
|
||||||
$this->entityContextManager->setShelfContext($shelf->id);
|
$this->entityContextManager->setShelfContext($shelf->id);
|
||||||
$view = setting()->getForCurrentUser('bookshelf_view_type');
|
$view = setting()->getForCurrentUser('bookshelf_view_type');
|
||||||
@ -108,8 +117,11 @@ class BookshelfController extends Controller
|
|||||||
$this->setPageTitle($shelf->getShortName());
|
$this->setPageTitle($shelf->getShortName());
|
||||||
return view('shelves.show', [
|
return view('shelves.show', [
|
||||||
'shelf' => $shelf,
|
'shelf' => $shelf,
|
||||||
|
'sortedVisibleShelfBooks' => $sortedVisibleShelfBooks,
|
||||||
'view' => $view,
|
'view' => $view,
|
||||||
'activity' => Activity::entityActivity($shelf, 20, 1)
|
'activity' => Activity::entityActivity($shelf, 20, 1),
|
||||||
|
'order' => $order,
|
||||||
|
'sort' => $sort
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -300,7 +300,7 @@ class UserController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function changeSort(Request $request, string $id, string $type)
|
public function changeSort(Request $request, string $id, string $type)
|
||||||
{
|
{
|
||||||
$validSortTypes = ['books', 'bookshelves'];
|
$validSortTypes = ['books', 'bookshelves', 'shelf_books'];
|
||||||
if (!in_array($type, $validSortTypes)) {
|
if (!in_array($type, $validSortTypes)) {
|
||||||
return redirect()->back(500);
|
return redirect()->back(500);
|
||||||
}
|
}
|
||||||
|
@ -9,19 +9,30 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<main class="card content-wrap">
|
<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">
|
<div class="book-content">
|
||||||
<p class="text-muted">{!! nl2br(e($shelf->description)) !!}</p>
|
<p class="text-muted">{!! nl2br(e($shelf->description)) !!}</p>
|
||||||
@if(count($shelf->visibleBooks) > 0)
|
@if(count($sortedVisibleShelfBooks) > 0)
|
||||||
@if($view === 'list')
|
@if($view === 'list')
|
||||||
<div class="entity-list">
|
<div class="entity-list">
|
||||||
@foreach($shelf->visibleBooks as $book)
|
@foreach($sortedVisibleShelfBooks as $book)
|
||||||
@include('books.list-item', ['book' => $book])
|
@include('books.list-item', ['book' => $book])
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
@else
|
@else
|
||||||
<div class="grid third">
|
<div class="grid third">
|
||||||
@foreach($shelf->visibleBooks as $key => $book)
|
@foreach($sortedVisibleShelfBooks as $key => $book)
|
||||||
@include('partials.entity-grid-item', ['entity' => $book])
|
@include('partials.entity-grid-item', ['entity' => $book])
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user