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

v1.5.17 - Added multiple events to event index

Browse Source
This commit is contained in:
Anders
2021-04-27 15:15:23 +02:00
parent e1d6bd95f5
commit 7e5c1f8dbe
7 changed files with 160 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/EventController.php
+5 -5
View File
@@ -289,11 +289,11 @@ class EventController extends Controller
}
public function previewPages(Request $request){
if(!Resource::find($request->preview)){
$event = Event::find($request->preview);
}else{
$event = Event::where('events.id', '=', $request->preview)->join('resources', 'resources.id', '=', 'events.resource_id')->first();
}
//if(!Resource::find($request->preview)){
// $event = Event::find($request->preview);
//}else{
$event = Event::where('events.id', '=', $request->preview)->leftJoin('resources', 'resources.id', '=', 'events.resource_id')->first();
//}
$convertToJsonArray = json_encode($event);
return $convertToJsonArray;
}