Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index fe9ece5b252e53b30addf58a4d08a1689c873b65..4313a4e2082a246bcf908db46a9f0814c8fcdec2 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,6 +1,7 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

+use BookStack\Book;

 use BookStack\Repos\EntityRepo;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;
 use BookStack\Repos\EntityRepo;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;


@@ -35,11 +36,12 @@ class BookController extends Controller
      */
     public function index()
     {
      */
     public function index()
     {

-        $books = $this->entityRepo->getAllPaginated('book', 10);
+        $books = $this->entityRepo->getAllPaginated('book', 16);

         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;

-        $popular = $this->entityRepo->getPopular('book', 4, 0);
+        $popular = $this->entityRepo->getPopular('book', 3, 0);
+        $display = $this->currentUser->display;

         $this->setPageTitle('Books');
         $this->setPageTitle('Books');

-        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
+        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]); //added displaly to access user display

     }
 
     /**
     }
 
     /**


@@ -207,13 +209,12 @@ class BookController extends Controller
 
         // Add activity for books
         foreach ($sortedBooks as $bookId) {
 
         // Add activity for books
         foreach ($sortedBooks as $bookId) {

+            /** @var Book $updatedBook */

             $updatedBook = $this->entityRepo->getById('book', $bookId);
             $updatedBook = $this->entityRepo->getById('book', $bookId);

+            $this->entityRepo->buildJointPermissionsForBook($updatedBook);

             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 

-        // Update permissions on changed models
-        if (count($updatedModels) === 0) $this->entityRepo->buildJointPermissions($updatedModels);
-

         return redirect($book->getUrl());
     }
 
         return redirect($book->getUrl());
     }