LDAP: Added TLS support

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

diff --git a/app/Http/Controllers/BookshelfController.php b/app/Http/Controllers/BookshelfController.php
index a0e9b719939727feebe89020606638bf34217963..efe280235bad18e75249b7a58ac50ff25a205d62 100644 (file)
--- a/app/Http/Controllers/BookshelfController.php
+++ b/app/Http/Controllers/BookshelfController.php
@@ -107,10 +107,12 @@ class BookshelfController extends Controller
 
         Views::add($shelf);
         $this->entityContextManager->setShelfContext($shelf->id);
 
         Views::add($shelf);
         $this->entityContextManager->setShelfContext($shelf->id);

+        $view = setting()->getForCurrentUser('bookshelf_view_type', config('app.views.books'));

 
         $this->setPageTitle($shelf->getShortName());
         return view('shelves.show', [
             'shelf' => $shelf,
 
         $this->setPageTitle($shelf->getShortName());
         return view('shelves.show', [
             'shelf' => $shelf,

+            'view' => $view,

             'activity' => Activity::entityActivity($shelf, 20, 1)
         ]);
     }
             'activity' => Activity::entityActivity($shelf, 20, 1)
         ]);
     }


@@ -180,7 +182,7 @@ class BookshelfController extends Controller
         $shelf = $this->bookshelfRepo->getBySlug($slug);
         $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $shelf = $this->bookshelfRepo->getBySlug($slug);
         $this->checkOwnablePermission('bookshelf-delete', $shelf);
 

-        Activity::addMessage('bookshelf_delete', $shelf->name);
+        Activity::add($shelf, 'bookshelf_delete');

         $this->bookshelfRepo->destroy($shelf);
 
         return redirect('/shelves');
         $this->bookshelfRepo->destroy($shelf);
 
         return redirect('/shelves');