diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 360e8604..cadba13d 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -251,10 +251,10 @@ class AdminController extends Controller $users = collect(); if ($request->has('uid')) { - $users = User::select(['uid', 'email', 'nickname', 'score', 'permission', 'register_at']) + $users = User::select(['uid', 'email', 'nickname', 'score', 'permission', 'verified', 'register_at']) ->where('uid', intval($request->input('uid'))); } else { - $users = User::select(['uid', 'email', 'nickname', 'score', 'permission', 'register_at']); + $users = User::select(['uid', 'email', 'nickname', 'score', 'permission', 'verified', 'register_at']); } return Datatables::of($users)->editColumn('email', function ($user) { @@ -326,6 +326,13 @@ class AdminController extends Controller return json(trans('admin.users.operations.email.success'), 0); + } elseif ($action == "verification") { + + $user->verified = !$user->verified; + $user->save(); + + return json(trans('admin.users.operations.verification.success'), 0); + } elseif ($action == "nickname") { $this->validate($request, [ 'nickname' => 'required|no_special_chars' diff --git a/resources/assets/src/js/admin/users.js b/resources/assets/src/js/admin/users.js index b01c7a04..d8bb088e 100644 --- a/resources/assets/src/js/admin/users.js +++ b/resources/assets/src/js/admin/users.js @@ -58,10 +58,16 @@ const usersTableColumnDefs = [ }, { targets: 6, - data: 'register_at' + data: 'verified', + className: 'verification', + render: data => trans('admin.' + (data ? 'verified' : 'unverified')) }, { targets: 7, + data: 'register_at' + }, + { + targets: 8, data: 'operations', searchable: false, orderable: false, @@ -108,6 +114,7 @@ function renderUsersTableOperations(currentUserPermission, type, row) {