Added basic system tests for markdown editor, Added extra test helpers

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 1207c87f1b02330dea430291c4afc7d13d5d4e87..d599316409cda20a0a273e26f3f0ca5ebc4c4608 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -35,6 +35,7 @@ class UserController extends Controller
      */
     public function index()
     {
      */
     public function index()
     {

+        $this->checkPermission('users-manage');

         $users = $this->userRepo->getAllUsers();
         $this->setPageTitle('Users');
         return view('users/index', ['users' => $users]);
         $users = $this->userRepo->getAllUsers();
         $this->setPageTitle('Users');
         return view('users/index', ['users' => $users]);


@@ -163,7 +164,9 @@ class UserController extends Controller
 
         $user->save();
         session()->flash('success', 'User successfully updated');
 
         $user->save();
         session()->flash('success', 'User successfully updated');

-        return redirect('/settings/users');
+
+        $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
+        return redirect($redirectUrl);

     }
 
     /**
     }
 
     /**