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 
 Conflicts:
	skolehjem/resources/views/admin/menuplans/edit.blade.php
	skolehjem/resources/views/admin/menuplans/index.blade.php
	skolehjem/resources/views/admin/menuplans/update.blade.php
This commit is contained in:
Sebastian Davaris
2020-06-29 08:32:52 +02:00
parent 66ddd32944 4576140d2f
commit 4061b590cb
9 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/ExternalLinkController.php
+5 -5
View File
@@ -19,7 +19,7 @@ class ExternalLinkController extends Controller
{
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
return Response::detect("external-links.index", [ "externalLinks" => $externalLink ]);
return Response::detect("external-links.index", [ "links" => $externalLink ]);
}
/**
@@ -59,7 +59,7 @@ class ExternalLinkController extends Controller
*/
public function show($id)
{
return Response::detect("external-links.show", [ "externallink" => $id]);
return Response::detect("external-links.show", [ "link" => $id]);
}
/**
@@ -71,7 +71,7 @@ class ExternalLinkController extends Controller
public function edit($id)
{
$link = ExternalLink::find($id);
return Response::detect("external-links.edit", ["externallink" => $link]);
return Response::detect("external-links.edit", ["link" => $link]);
}
/**
@@ -84,8 +84,8 @@ class ExternalLinkController extends Controller
public function update(Request $request, $id)
{
$data = $request->validate([
"name" => "",
"link" => ""
"name" => "max:255",
"link" => "max:255"
]);
$id->update($data);