Found the source of the issue, not sure how to fix

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 682fc5415568ec3e81efbbe318f3da81b085625d..d577a85b134dcd060eebf72b2be744bc8914766e 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -42,8 +42,10 @@ class BookController extends Controller
     public function index()
     {
         $books = $this->bookRepo->getAllPaginated(10);
     public function index()
     {
         $books = $this->bookRepo->getAllPaginated(10);

-        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(10, 0) : false;
-        return view('books/index', ['books' => $books, 'recents' => $recents]);
+        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(4, 0) : false;
+        $popular = $this->bookRepo->getPopular(4, 0);
+        $this->setPageTitle('Books');
+        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);

     }
 
     /**
     }
 
     /**


@@ -54,6 +56,7 @@ class BookController extends Controller
     public function create()
     {
         $this->checkPermission('book-create');
     public function create()
     {
         $this->checkPermission('book-create');

+        $this->setPageTitle('Create New Book');

         return view('books/create');
     }
 
         return view('books/create');
     }
 


@@ -88,8 +91,10 @@ class BookController extends Controller
     public function show($slug)
     {
         $book = $this->bookRepo->getBySlug($slug);
     public function show($slug)
     {
         $book = $this->bookRepo->getBySlug($slug);

+        $bookChildren = $this->bookRepo->getChildren($book);

         Views::add($book);
         Views::add($book);

-        return view('books/show', ['book' => $book, 'current' => $book]);
+        $this->setPageTitle($book->getShortName());
+        return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);

     }
 
     /**
     }
 
     /**


@@ -102,6 +107,7 @@ class BookController extends Controller
     {
         $this->checkPermission('book-update');
         $book = $this->bookRepo->getBySlug($slug);
     {
         $this->checkPermission('book-update');
         $book = $this->bookRepo->getBySlug($slug);

+        $this->setPageTitle('Edit Book ' . $book->getShortName());

         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 
         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 


@@ -137,6 +143,7 @@ class BookController extends Controller
     {
         $this->checkPermission('book-delete');
         $book = $this->bookRepo->getBySlug($bookSlug);
     {
         $this->checkPermission('book-delete');
         $book = $this->bookRepo->getBySlug($bookSlug);

+        $this->setPageTitle('Delete Book ' . $book->getShortName());

         return view('books/delete', ['book' => $book, 'current' => $book]);
     }
 
         return view('books/delete', ['book' => $book, 'current' => $book]);
     }
 


@@ -149,14 +156,23 @@ class BookController extends Controller
     {
         $this->checkPermission('book-update');
         $book = $this->bookRepo->getBySlug($bookSlug);
     {
         $this->checkPermission('book-update');
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $books = $this->bookRepo->getAll();
-        return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books]);
+        $bookChildren = $this->bookRepo->getChildren($book);
+        $books = $this->bookRepo->getAll(false);
+        $this->setPageTitle('Sort Book ' . $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->bookRepo->getBySlug($bookSlug);
     public function getSortItem($bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        return view('books/sort-box', ['book' => $book]);
+        $bookChildren = $this->bookRepo->getChildren($book);
+        return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);

     }
 
     /**
     }
 
     /**