From: Nilesh Deepak <redacted>
Date: Tue, 4 Jul 2017 09:46:46 +0000 (+0530)
Subject: Merge branch 'master' into issue-181
X-Git-Tag: v0.19.0~1^2~15^2~32^2~14^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/bce5fdd5cd82d274b4f944938a8080c1d75e4ce0?hp=-c

Merge branch 'master' into issue-181
---

bce5fdd5cd82d274b4f944938a8080c1d75e4ce0
diff --combined app/Http/Controllers/BookController.php
index 086929558,4313a4e20..4ed945944
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@@ -36,11 -36,12 +36,13 @@@ class BookController extends Controlle
       */
      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;
-         $popular = $this->entityRepo->getPopular('book', 4, 0);
+         $popular = $this->entityRepo->getPopular('book', 3, 0);
+         $display = $this->currentUser->display;
          $this->setPageTitle('Books');
-         return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]);  //added displaly to access user display
++
+         return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]); //added displaly to access user display
      }
  
      /**
@@@ -67,14 -68,7 +69,14 @@@
              'name' => 'required|string|max:255',
              'description' => 'string|max:1000'
          ]);
 +        $image = $request->file('image');
 +        $input = time().'-'.$image->getClientOriginalName();
 +        $destinationPath = public_path('uploads/book/');
 +        $image->move($destinationPath, $input);
 +        $path = baseUrl('/uploads/book/').'/'.$input;
          $book = $this->entityRepo->createFromInput('book', $request->all());
 +        $book->image = $path; 
 +        $book->save();
          Activity::add($book, 'book_create', $book->id);
          return redirect($book->getUrl());
      }
@@@ -121,17 -115,9 +123,17 @@@
              'name' => 'required|string|max:255',
              'description' => 'string|max:1000'
          ]);
 -        $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
 -        Activity::add($book, 'book_update', $book->id);
 -        return redirect($book->getUrl());
 +            
 +            $input = $request->file('image')->getClientOriginalName();
 +            echo $input;
 +         $destinationPath = public_path('uploads/book/');
 +         $request->file('image')->move($destinationPath, $input);
 +         $path = baseUrl('/uploads/book/').'/'.$input;
 +         $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
 +         $book->image = $path; 
 +         $book->save();
 +         Activity::add($book, 'book_update', $book->id);
 +         return redirect($book->getUrl());
      }
  
      /**