Improved empty lists. Fixes #10.

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index fcb8c77528fdd8b28684fb2fa9a74dc6aafe09df..91cd4bd518ddf67158c38d85d0c0962a06a3bb4d 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -2,8 +2,10 @@
 
 namespace Oxbow\Http\Controllers;
 
 
 namespace Oxbow\Http\Controllers;
 

+use Activity;

 use Illuminate\Http\Request;
 
 use Illuminate\Http\Request;
 

+use Illuminate\Support\Facades\Auth;

 use Illuminate\Support\Str;
 use Oxbow\Http\Requests;
 use Oxbow\Repos\BookRepo;
 use Illuminate\Support\Str;
 use Oxbow\Http\Requests;
 use Oxbow\Repos\BookRepo;


@@ -24,6 +26,7 @@ class BookController extends Controller
     {
         $this->bookRepo = $bookRepo;
         $this->pageRepo = $pageRepo;
     {
         $this->bookRepo = $bookRepo;
         $this->pageRepo = $pageRepo;

+        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -44,28 +47,29 @@ class BookController extends Controller
      */
     public function create()
     {
      */
     public function create()
     {

+        $this->checkPermission('book-create');

         return view('books/create');
     }
 
     /**
      * Store a newly created book in storage.
      *
         return view('books/create');
     }
 
     /**
      * Store a newly created book in storage.
      *

-     * @param  Request  $request
+     * @param  Request $request

      * @return Response
      */
     public function store(Request $request)
     {
      * @return Response
      */
     public function store(Request $request)
     {

+        $this->checkPermission('book-create');

         $this->validate($request, [
         $this->validate($request, [

-            'name' => 'required|string|max:255',
+            'name'        => 'required|string|max:255',

             'description' => 'string|max:1000'
         ]);
         $book = $this->bookRepo->newFromInput($request->all());
             'description' => 'string|max:1000'
         ]);
         $book = $this->bookRepo->newFromInput($request->all());

-        $slug = Str::slug($book->name);
-        while($this->bookRepo->countBySlug($slug) > 0) {
-            $slug .= '1';
-        }
-        $book->slug = $slug;
+        $book->slug = $this->bookRepo->findSuitableSlug($book->name);
+        $book->created_by = Auth::user()->id;
+        $book->updated_by = Auth::user()->id;

         $book->save();
         $book->save();

+        Activity::add($book, 'book_create', $book->id);

         return redirect('/books');
     }
 
         return redirect('/books');
     }
 


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

-        $pageTree = $this->pageRepo->getTreeByBookId($book->id);
-        return view('books/show', ['book' => $book, 'pageTree' => $pageTree]);
+        return view('books/show', ['book' => $book, 'current' => $book]);

     }
 
     /**
     }
 
     /**


@@ -90,43 +93,58 @@ class BookController extends Controller
      */
     public function edit($slug)
     {
      */
     public function edit($slug)
     {

+        $this->checkPermission('book-update');

         $book = $this->bookRepo->getBySlug($slug);
         $book = $this->bookRepo->getBySlug($slug);

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

     }
 
     /**
      * Update the specified book in storage.
      *
      * @param  Request $request
     }
 
     /**
      * Update the specified book in storage.
      *
      * @param  Request $request

-     * @param $slug
+     * @param          $slug

      * @return Response
      */
     public function update(Request $request, $slug)
     {
      * @return Response
      */
     public function update(Request $request, $slug)
     {

+        $this->checkPermission('book-update');

         $book = $this->bookRepo->getBySlug($slug);
         $this->validate($request, [
         $book = $this->bookRepo->getBySlug($slug);
         $this->validate($request, [

-            'name' => 'required|string|max:255',
+            'name'        => 'required|string|max:255',

             'description' => 'string|max:1000'
         ]);
         $book->fill($request->all());
             'description' => 'string|max:1000'
         ]);
         $book->fill($request->all());

-        $slug = Str::slug($book->name);
-        while($this->bookRepo->countBySlug($slug) > 0 && $book->slug != $slug) {
-            $slug += '1';
-        }
-        $book->slug = $slug;
+        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
+        $book->updated_by = Auth::user()->id;

         $book->save();
         $book->save();

+        Activity::add($book, 'book_update', $book->id);

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

+    /**
+     * Shows the page to confirm deletion
+     * @param $bookSlug
+     * @return \Illuminate\View\View
+     */
+    public function showDelete($bookSlug)
+    {
+        $this->checkPermission('book-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        return view('books/delete', ['book' => $book, 'current' => $book]);
+    }
+

     /**
      * Remove the specified book from storage.
      *
     /**
      * Remove the specified book from storage.
      *

-     * @param  int  $id
+     * @param $bookSlug

      * @return Response
      */
      * @return Response
      */

-    public function destroy($id)
+    public function destroy($bookSlug)

     {
     {

-        $this->bookRepo->destroyById($id);
+        $this->checkPermission('book-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        Activity::addMessage('book_delete', 0, $book->name);
+        $this->bookRepo->destroyBySlug($bookSlug);

         return redirect('/books');
     }
 }
         return redirect('/books');
     }
 }