From: Dan Brown <redacted>
Date: Sun, 4 Feb 2018 11:41:51 +0000 (+0000)
Subject: Merge pull request #692 from lommes/master
X-Git-Tag: v0.20.0~1^2~11
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/46ea90c36ee5d50d63b9e0dcd6cb73327f1a8ded?hp=3cf2c6a0273ae73c6b68a1b27a6ae0a6cb1d4413

Merge pull request #692 from lommes/master

Corrected the keys for okta auth
---

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 7a98bd49e..decdfda49 100644
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -40,7 +40,7 @@ class BookController extends Controller
         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
         $popular = $this->entityRepo->getPopular('book', 4, 0);
         $new = $this->entityRepo->getRecentlyCreated('book', 4, 0);
-        $booksViewType = setting()->getUser($this->currentUser, 'books_view_type', 'list');
+        $booksViewType = setting()->getUser($this->currentUser, 'books_view_type', config('app.views.books', 'list'));
         $this->setPageTitle(trans('entities.books'));
         return view('books/index', [
             'books' => $books,
diff --git a/config/app.php b/config/app.php
index e408fb3a5..b40389bed 100755
--- a/config/app.php
+++ b/config/app.php
@@ -2,11 +2,14 @@
 
 return [
 
-
     'env' => env('APP_ENV', 'production'),
 
     'editor' => env('APP_EDITOR', 'html'),
 
+    'views' => [
+        'books' => env('APP_VIEWS_BOOKS', 'list')
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode