Merge branch 'master' of https://github.com/OsmosysSoftware/BookStack

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 4ed945944364bc70bf21230b5cc9d806f2d61839..eecb7839f378439519a57a2c526f845fab22d958 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -39,10 +39,9 @@ class BookController extends Controller
         $books = $this->entityRepo->getAllPaginated('book', 16);
         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
         $popular = $this->entityRepo->getPopular('book', 3, 0);
-        $display = $this->currentUser->display;
+        $books_display = $this->currentUser->books_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, 'books_display' => $books_display] );
     }
 
     /**
@@ -69,14 +68,7 @@ class BookController extends Controller
             '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());
     }
@@ -123,15 +115,7 @@ class BookController extends Controller
             '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());
     }