Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2540 from HavilaQQ/user-delete-fix

Browse source 
Fix artisan p:user:delete not working
This commit is contained in:
Dane Everitt 2020-10-17 10:35:48 -07:00 committed by GitHub
commit 6aeb467155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Console/Commands/User/DeleteUserCommand.php
View file

@ -58,8 +58,9 @@ class DeleteUserCommand extends Command
Assert::notEmpty($search, 'Search term should be an email address, got: %s.'); Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
$results = User::query() $results = User::query()
->where('email', 'LIKE', "$search%") ->where('id', 'LIKE', "$search%")
->where('username', 'LIKE', "$search%") ->orWhere('username', 'LIKE', "$search%")
->orWhere('email', 'LIKE', "$search%")
->get(); ->get();
if (count($results) < 1) { if (count($results) < 1) {

2
resources/lang/en/command/messages.php
View file

@ -14,7 +14,7 @@ return [
'deleted' => 'Successfully deleted the requested location.', 'deleted' => 'Successfully deleted the requested location.',
], ],
'user' => [ 'user' => [
'search_users' => 'Enter a Username, UUID, or Email Address', 'search_users' => 'Enter a Username, User ID, or Email Address',
'select_search_user' => 'ID of user to delete (Enter \'0\' to re-search)', 'select_search_user' => 'ID of user to delete (Enter \'0\' to re-search)',
'deleted' => 'User successfully deleted from the Panel.', 'deleted' => 'User successfully deleted from the Panel.',
'confirm_delete' => 'Are you sure you want to delete this user from the Panel?', 'confirm_delete' => 'Are you sure you want to delete this user from the Panel?',