diff --git a/app/Console/Commands/NntmuxPurgeDeletedAccounts.php b/app/Console/Commands/NntmuxPurgeDeletedAccounts.php index d6ab76f2f..757eef4ec 100644 --- a/app/Console/Commands/NntmuxPurgeDeletedAccounts.php +++ b/app/Console/Commands/NntmuxPurgeDeletedAccounts.php @@ -31,6 +31,7 @@ class NntmuxPurgeDeletedAccounts extends Command PurgeDeletedAccounts::dispatch(); $this->info('Job dispatched to purge deleted accounts'); + return Command::SUCCESS; } } diff --git a/app/Http/Controllers/Admin/DeletedUsersController.php b/app/Http/Controllers/Admin/DeletedUsersController.php index 6956e77de..893ec4cef 100644 --- a/app/Http/Controllers/Admin/DeletedUsersController.php +++ b/app/Http/Controllers/Admin/DeletedUsersController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\BasePageController; use App\Models\User; use Illuminate\Http\Request; -use Illuminate\Support\Facades\View; class DeletedUsersController extends BasePageController { @@ -23,13 +22,13 @@ class DeletedUsersController extends BasePageController $deletedUsers = User::onlyTrashed() ->when($username !== '', function ($query) use ($username) { - return $query->where('username', 'like', '%' . $username . '%'); + return $query->where('username', 'like', '%'.$username.'%'); }) ->when($email !== '', function ($query) use ($email) { - return $query->where('email', 'like', '%' . $email . '%'); + return $query->where('email', 'like', '%'.$email.'%'); }) ->when($host !== '', function ($query) use ($host) { - return $query->where('host', 'like', '%' . $host . '%'); + return $query->where('host', 'like', '%'.$host.'%'); }); // Determine sort order @@ -63,6 +62,7 @@ class DeletedUsersController extends BasePageController if ($user) { $user->restore(); + return redirect()->route('admin.deleted.users.index') ->with('success', "User '{$user->username}' has been restored successfully."); } @@ -81,6 +81,7 @@ class DeletedUsersController extends BasePageController if ($user) { $username = $user->username; $user->forceDelete(); + return redirect()->route('admin.deleted.users.index') ->with('success', "User '{$username}' has been permanently deleted."); } diff --git a/app/Models/User.php b/app/Models/User.php index 47b546800..5cbcdbef7 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -13,6 +13,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Http\Request; use Illuminate\Notifications\Notifiable; @@ -27,7 +28,6 @@ use Junaidnasir\Larainvite\Facades\Invite; use Junaidnasir\Larainvite\InviteTrait; use Spatie\Permission\Models\Role; use Spatie\Permission\Traits\HasRoles; -use Illuminate\Database\Eloquent\SoftDeletes; /** * App\Models\User. @@ -148,7 +148,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; */ class User extends Authenticatable { - use HasRoles, InviteTrait, Notifiable, UserVerification, SoftDeletes; + use HasRoles, InviteTrait, Notifiable, SoftDeletes, UserVerification; public const ERR_SIGNUP_BADUNAME = -1;