X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/da37700ac23b0a3789c7da1ed3517d1900d5894d..refs/pull/2510/head:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index b1b7e5c44..92e1cd8b7 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -27,7 +27,6 @@ class UserController extends Controller $this->userRepo = $userRepo; $this->inviteService = $inviteService; $this->imageRepo = $imageRepo; - parent::__construct(); } /** @@ -42,6 +41,7 @@ class UserController extends Controller 'sort' => $request->get('sort', 'name'), ]; $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails); + $this->setPageTitle(trans('settings.users')); $users->appends($listDetails); return view('users.index', ['users' => $users, 'listDetails' => $listDetails]); @@ -189,7 +189,7 @@ class UserController extends Controller $user->image_id = $image->id; } - // Delete the profile image if set to + // Delete the profile image if reset option is in request if ($request->has('profile_image_reset')) { $this->imageRepo->destroyImage($user->avatar); } @@ -218,12 +218,13 @@ class UserController extends Controller * Remove the specified user from storage. * @throws \Exception */ - public function destroy(int $id) + public function destroy(Request $request, int $id) { $this->preventAccessInDemoMode(); $this->checkPermissionOrCurrentUser('users-manage', $id); $user = $this->userRepo->getById($id); + $newOwnerId = $request->get('new_owner_id', null); if ($this->userRepo->isOnlyAdmin($user)) { $this->showErrorNotification(trans('errors.users_cannot_delete_only_admin')); @@ -235,7 +236,7 @@ class UserController extends Controller return redirect($user->getEditUrl()); } - $this->userRepo->destroy($user); + $this->userRepo->destroy($user, $newOwnerId); $this->showSuccessNotification(trans('settings.users_delete_success')); $this->logActivity(ActivityType::USER_DELETE, $user);