Adds overflow:auto to popup content to allow it to scroll in lower res.

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 5c10133a2cbe1aa6c4a2cf3e6cfd86777bfb0c01..2fe22f1e107f99e7ced4cbbff5dd344dd24444ba 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -250,10 +250,18 @@ class UserController extends Controller
         ]);
     }
 
+    /**
+     * Update the user's preferred book-list display setting.
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
     public function switchBookView($id, Request $request) {
-        $this->checkPermission('users-manage');
-        $viewType = $request->get('book_view_type');
+        $this->checkPermissionOr('users-manage', function () use ($id) {
+            return $this->currentUser->id == $id;
+        });
 
+        $viewType = $request->get('book_view_type');
         if (!in_array($viewType, ['grid', 'list'])) {
             $viewType = 'list';
         }
@@ -261,13 +269,7 @@ class UserController extends Controller
         $user = $this->user->findOrFail($id);
         setting()->putUser($user, 'books_view_type', $viewType);
 
-        $previousUrl = url()->previous();
-        if (empty($previousUrl)) {
-            // if no previous URL, redirect to settings
-            return redirect("/settings/users/$id");
-        } else {
-            // redirect to the previous page.
-            return redirect($previousUrl);
-        }
+        return redirect()->back(302, [], "/settings/users/$id");
     }
+
 }