@@ -32,28 +32,28 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | if ($request->has('username') && !empty($request->input('username'))) { |
| 35 | - $query->whereHas('user', function ($q) use ($request) { |
|
| 36 | - $q->where('username', 'like', '%' . $request->input('username') . '%'); |
|
| 35 | + $query->whereHas('user', function($q) use ($request) { |
|
| 36 | + $q->where('username', 'like', '%'.$request->input('username').'%'); |
|
| 37 | 37 | }); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if ($request->has('role_id') && !empty($request->input('role_id'))) { |
| 41 | - $query->where(function ($q) use ($request) { |
|
| 41 | + $query->where(function($q) use ($request) { |
|
| 42 | 42 | $q->where('old_role_id', $request->input('role_id')) |
| 43 | 43 | ->orWhere('new_role_id', $request->input('role_id')); |
| 44 | 44 | }); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | if ($request->has('change_reason') && !empty($request->input('change_reason'))) { |
| 48 | - $query->where('change_reason', 'like', '%' . $request->input('change_reason') . '%'); |
|
| 48 | + $query->where('change_reason', 'like', '%'.$request->input('change_reason').'%'); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if ($request->has('date_from') && !empty($request->input('date_from'))) { |
| 52 | - $query->where('created_at', '>=', $request->input('date_from') . ' 00:00:00'); |
|
| 52 | + $query->where('created_at', '>=', $request->input('date_from').' 00:00:00'); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | if ($request->has('date_to') && !empty($request->input('date_to'))) { |
| 56 | - $query->where('created_at', '<=', $request->input('date_to') . ' 23:59:59'); |
|
| 56 | + $query->where('created_at', '<=', $request->input('date_to').' 23:59:59'); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | // Pagination |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $this->setAdminPrefs(); |
| 89 | 89 | |
| 90 | 90 | $user = User::findOrFail($userId); |
| 91 | - $meta_title = $title = 'Role History for ' . $user->username; |
|
| 91 | + $meta_title = $title = 'Role History for '.$user->username; |
|
| 92 | 92 | |
| 93 | 93 | $history = UserRoleHistory::with(['oldRole', 'newRole', 'changedByUser']) |
| 94 | 94 | ->where('user_id', $userId) |