vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

Browse Source
This commit is contained in:
frederikpyt
2020-08-03 13:50:34 +02:00
parent 093a944980 01f9502653
commit ae14081221
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/UserController.php
+4 -11
View File
@@ -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){