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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anders
2020-08-25 14:48:58 +02:00
parent 3b6b20f934 c1972e70c8
commit 0bd324e996
7 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/RootController.php
+3 -3
View File
@@ -15,18 +15,18 @@ class RootController extends Controller
}
public function index() {
$perPage = 2;
$perPage = 5;
if(auth()->user()->can('admin.panel.show')) {
if(Response::detect("root.index")->name() == "admin.root.index")
return Response::detect("root.index");
else {
$news = News::query()->orderBy('id', 'asc')->paginate($perPage);
$news = News::query()->orderBy('id', 'desc')->paginate($perPage);
return Response::detect("root.index", ["news" => $news]);
}
}
else {
$news = News::query()->orderBy('id', 'asc')->paginate($perPage, ['*'], "page");
$news = News::query()->orderBy('id', 'desc')->paginate($perPage, ['*'], "page");
return view('app.root.index', ["news" => $news]);
}
skolehjem/app/Http/Controllers/WashingMachineController.php
+2 -2
View File
@@ -202,7 +202,7 @@ class WashingMachineController extends Controller
}
}else{
$output.='<tr>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu</td>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>'.
'<td></td>'.
'<td></td>'.
'<td></td>'.
@@ -228,7 +228,7 @@ class WashingMachineController extends Controller
}
}else{
$output.='<tr>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu</td>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>'.
'<td></td>'.
'<td></td>'.
'<td></td>'.