[Fix] app_footer_links_desc

[bookstack] / app / Http / Controllers / BookshelfController.php

diff --git a/app/Http/Controllers/BookshelfController.php b/app/Http/Controllers/BookshelfController.php
index 6c090a26da999cecbe12f7482b1e872d548d7421..03b3cad54cc0a538fd8de9794e3d647b2b4dca0b 100644 (file)
--- a/app/Http/Controllers/BookshelfController.php
+++ b/app/Http/Controllers/BookshelfController.php
@@ -32,7 +32,7 @@ class BookshelfController extends Controller
      */
     public function index()
     {
      */
     public function index()
     {

-        $view = setting()->getForCurrentUser('bookshelves_view_type', config('app.views.bookshelves', 'grid'));
+        $view = setting()->getForCurrentUser('bookshelves_view_type');

         $sort = setting()->getForCurrentUser('bookshelves_sort', 'name');
         $order = setting()->getForCurrentUser('bookshelves_sort_order', 'asc');
         $sortOptions = [
         $sort = setting()->getForCurrentUser('bookshelves_sort', 'name');
         $order = setting()->getForCurrentUser('bookshelves_sort_order', 'asc');
         $sortOptions = [


@@ -101,18 +101,17 @@ class BookshelfController extends Controller
         $shelf = $this->bookshelfRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-view', $shelf);
 
         $shelf = $this->bookshelfRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-view', $shelf);
 

-        $sort = setting()->getForCurrentUser('shelf_books_sort', 'name');
+        $sort = setting()->getForCurrentUser('shelf_books_sort', 'default');

         $order = setting()->getForCurrentUser('shelf_books_sort_order', 'asc');
 
         $order = setting()->getForCurrentUser('shelf_books_sort_order', 'asc');
 

-        $visibleShelfBooks = $shelf->visibleBooks()->get();
-        $sortedVisibleShelfBooks = $visibleShelfBooks
-            ->sortBy($sort, SORT_REGULAR, $order === 'desc')
+        $sortedVisibleShelfBooks = $shelf->visibleBooks()->get()
+            ->sortBy($sort === 'default' ? 'pivot.order' : $sort, SORT_REGULAR, $order === 'desc')

             ->values()
             ->all();
 
         Views::add($shelf);
         $this->entityContextManager->setShelfContext($shelf->id);
             ->values()
             ->all();
 
         Views::add($shelf);
         $this->entityContextManager->setShelfContext($shelf->id);

-        $view = setting()->getForCurrentUser('bookshelf_view_type', config('app.views.books'));
+        $view = setting()->getForCurrentUser('bookshelf_view_type');

 
         $this->setPageTitle($shelf->getShortName());
         return view('shelves.show', [
 
         $this->setPageTitle($shelf->getShortName());
         return view('shelves.show', [