From 282e6e07b47915a8d4d7ed023f5fd5bdf319bd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Wed, 14 Feb 2018 05:49:49 +0900 Subject: [PATCH] Fixed an issue with getting proper name colours. --- app/Http/Controllers/UserController.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index a7fd3f4..95e01f4 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -19,16 +19,17 @@ class UserController extends Controller { ->join('usr_profile', 'usr_profile.user_id', '=', 'users.id') ->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'users.id') ->get(array( - "id", - "username", - "email", - "reg_date", - "gender", - "ip_address", - "avatar", - "name_style", - "display_name", - "country" + 'id', + 'username', + 'perm_id', + 'email', + 'reg_date', + 'gender', + 'ip_address', + 'avatar', + 'name_style', + 'display_name', + 'country' )); } @@ -39,7 +40,7 @@ class UserController extends Controller { ->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'users.id') ->where('id', $id) ->get(array( - "users.id", + 'users.id', 'username', 'perm_id', 'member_title', @@ -109,7 +110,6 @@ class UserController extends Controller { "username" => $request->username, "password" => $check_password ); -//dd($credentials); try { if (!$token = JWTAuth::attempt($credentials)) { return response()->json(['error' => 'invalid_credentials'], 401);