github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-02 15:35:18 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Added user ownership migrate to delete screen.

Browse Source
This commit is contained in:
Dan Brown
2021-01-01 18:31:01 +00:00
parent 99b14621f9
commit 5e686bb624
6 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/UserController.php
View File

@ -217,12 +217,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'));
@ -234,7 +235,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);