banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-29 15:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix user deletion in no interactive mode (#506)

Browse Source
This commit is contained in:
Boy132 2024-07-29 12:13:08 +02:00 committed by GitHub
parent e1bdf95971
commit bddd6af8af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Console/Commands/User/DeleteUserCommand.php
View File

@ -15,7 +15,7 @@ class DeleteUserCommand extends Command
public function handle(): int public function handle(): int
{ {
$search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users')); $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
Assert::notEmpty($search, 'Search term should be an email address, got: %s.'); Assert::notEmpty($search, 'Search term should not be empty.');
$results = User::query() $results = User::query()
->where('id', 'LIKE', "$search%") ->where('id', 'LIKE', "$search%")
@ -42,6 +42,8 @@ class DeleteUserCommand extends Command
if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) { if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
return $this->handle(); return $this->handle();
} }
$deleteUser = User::query()->findOrFail($deleteUser);
} else { } else {
if (count($results) > 1) { if (count($results) > 1) {
$this->error(trans('command/messages.user.multiple_found')); $this->error(trans('command/messages.user.multiple_found'));
@ -53,8 +55,7 @@ class DeleteUserCommand extends Command
} }
if ($this->confirm(trans('command/messages.user.confirm_delete')) || !$this->input->isInteractive()) { if ($this->confirm(trans('command/messages.user.confirm_delete')) || !$this->input->isInteractive()) {
$user = User::query()->findOrFail($deleteUser); $deleteUser->delete();
$user->delete();
$this->info(trans('command/messages.user.deleted')); $this->info(trans('command/messages.user.deleted'));
} }