Aligned constructors across controller classes

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 1643c62f980cd151dabd3fedf0031084bd336c78..07a30996e2e3e109a12bbeaefc7ae95b8a878474 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,12 +1,12 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

+use BookStack\Actions\ActivityType;

 use BookStack\Entities\Managers\BookContents;
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Managers\EntityContext;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Entities\Managers\BookContents;
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Managers\EntityContext;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Exceptions\NotifyException;

 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;


@@ -18,14 +18,10 @@ class BookController extends Controller
     protected $bookRepo;
     protected $entityContextManager;
 
     protected $bookRepo;
     protected $entityContextManager;
 

-    /**
-     * BookController constructor.
-     */

     public function __construct(EntityContext $entityContextManager, BookRepo $bookRepo)
     {
         $this->bookRepo = $bookRepo;
         $this->entityContextManager = $entityContextManager;
     public function __construct(EntityContext $entityContextManager, BookRepo $bookRepo)
     {
         $this->bookRepo = $bookRepo;
         $this->entityContextManager = $entityContextManager;

-        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -97,11 +93,10 @@ class BookController extends Controller
 
         $book = $this->bookRepo->create($request->all());
         $this->bookRepo->updateCoverImage($book, $request->file('image', null));
 
         $book = $this->bookRepo->create($request->all());
         $this->bookRepo->updateCoverImage($book, $request->file('image', null));

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

 
         if ($bookshelf) {
             $bookshelf->appendBook($book);
 
         if ($bookshelf) {
             $bookshelf->appendBook($book);

-            Activity::add($bookshelf, 'bookshelf_update');
+            Activity::addForEntity($bookshelf, ActivityType::BOOKSHELF_UPDATE);

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


@@ -162,8 +157,6 @@ class BookController extends Controller
         $resetCover = $request->has('image_reset');
         $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
 
         $resetCover = $request->has('image_reset');
         $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
 

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

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


@@ -181,14 +174,12 @@ class BookController extends Controller
     /**
      * Remove the specified book from the system.
      * @throws Throwable
     /**
      * Remove the specified book from the system.
      * @throws Throwable

-     * @throws NotifyException

      */
     public function destroy(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
 
      */
     public function destroy(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
 

-        Activity::addMessage('book_delete', $book->name);

         $this->bookRepo->destroy($book);
 
         return redirect('/books');
         $this->bookRepo->destroy($book);
 
         return redirect('/books');