diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 33ebb3f..3e817a2 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -38,7 +38,8 @@ class UserController extends Controller */ public function index(Request $request) { - $users = User::query()->paginate($request->query("page", 20)); + //$users = User::query()->paginate($request->query("page", 20)); + $users = User::query()->orderBy('id', 'asc')->paginate(20); return Response::detect("users.index", [ "users" => $users ]); } @@ -320,7 +321,7 @@ class UserController extends Controller foreach ($roles as $role) { if($user->hasRole($role)) { array_push($users, $user); - break 2; + break 1; } } } @@ -347,7 +348,7 @@ class UserController extends Controller foreach ($roles as $role) { if($user->hasRole($role)) { array_push($users, $user); - break 2; + break 1; } } } @@ -379,14 +380,6 @@ class UserController extends Controller } - - //Dont delete - /*elseif ($request->isCheck === "rolle") - $users = User::query()->where('rolle', 'LIKE',$request->search.'%');*/ - - - - if(count($users) !== 0){ foreach ($users as $key => $user){ diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php index 3ec8442..ec85be1 100644 --- a/skolehjem/resources/views/admin/feedbacks/index.blade.php +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -47,7 +47,6 @@ url: '{{route('feedbacks.search')}}', data: {'option':$value}, success:function (data) { - console.log($value); $('tbody').html(data); }, error:function (data) { diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 703106e..76f7a53 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -70,13 +70,16 @@ {{ $users->links() }}