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 086929558ff55c08412369c8cd48a753c67c5d42..4313a4e2082a246bcf908db46a9f0814c8fcdec2 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -36,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, '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 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             '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 = $this->entityRepo->createFromInput('book', $request->all());

-        $book->image = $path; 
-        $book->save();

         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }


@@ -121,17 +115,9 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-            
-            $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());
+        $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
+        Activity::add($book, 'book_update', $book->id);
+        return redirect($book->getUrl());

     }
 
     /**
     }
 
     /**