diff --git a/app/Http/Controllers/PodcastController.php b/app/Http/Controllers/PodcastController.php index e1c3da86..9b945911 100644 --- a/app/Http/Controllers/PodcastController.php +++ b/app/Http/Controllers/PodcastController.php @@ -29,14 +29,23 @@ class PodcastController extends Controller $podcasts[] = new \Model\Podcast($podcast); } - return view($request->ajax() ? 'partial.podcastitems' : 'podcastseries', array_merge($viewData, ['podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken'])); + return view($request->ajax() ? 'partial.podcastitems' : 'podcastseries', array_merge($viewData, ['podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => true])); } public function podcast(Request $request, $id) { parent::registerView($request, 'podcast', $id); $apiResult = $this->API('podcast/details/' . (int)$id); - $podcast = new \Model\Podcast($apiResult); - return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata]); + $podcast = new \Model\Podcast($apiResult); + $podcasts = []; + if($podcast->program) { + $apiResult = $this->API('podcast/programma/' . (int)$podcast->program->id . '?pagina=1&aantal=5'); + $podcasts = []; + foreach($apiResult->podcasts as $p) + { + $podcasts[] = new \Model\Podcast($p); + } + } + return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'isPodcast' => true]); } } diff --git a/app/Http/Controllers/RadioController.php b/app/Http/Controllers/RadioController.php index 39c45c71..ba2087cf 100644 --- a/app/Http/Controllers/RadioController.php +++ b/app/Http/Controllers/RadioController.php @@ -56,7 +56,7 @@ class RadioController extends Controller public function podcast(Request $request, $id, $title = '') { if($this->checkAPI('podcast/details/' . (int)$id) != "200"){ - return view('podcastitem', array_merge($this->getSidebareData(), ['title' => $title, 'podcast' => null, 'metadata' => null, 'related' => [], 'searchURL' => 'gemist/zoeken'])); + return view('podcastitem', array_merge($this->getSidebareData(), ['title' => $title, 'podcast' => null, 'metadata' => null, 'related' => [], 'searchURL' => 'gemist/zoeken', 'isPodcast' => false])); } parent::registerView($request, 'podcast', $id); @@ -71,7 +71,7 @@ class RadioController extends Controller $podcasts[] = new \Model\Podcast($_podcast); } - return view($request->ajax() ? 'partial/podcastitems' : 'podcastitem', ['title' => $title, 'podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken']); + return view($request->ajax() ? 'partial/podcastitems' : 'podcastitem', ['title' => $title, 'podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => false]); } public function podcasts(Request $request, $programma = null) @@ -107,7 +107,7 @@ class RadioController extends Controller } } - return view($request->ajax() ? 'partial/programitems' : 'programlist', ['programs' => array_reverse($programs)]); + return view($request->ajax() ? 'partial/programitems' : 'programlist', ['programs' => array_reverse($programs), 'isPodcast' => false]); } private function getPodcastList(Request $request, $action, $viewData = []) @@ -120,7 +120,7 @@ class RadioController extends Controller $podcasts[] = new \Model\Podcast($podcast); } - return view($request->ajax() ? 'partial/podcastitems' : 'podcastlist', array_merge($viewData, ['id' => 'items-podcasts', 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken'])); + return view($request->ajax() ? 'partial/podcastitems' : 'podcastlist', array_merge($viewData, ['id' => 'items-podcasts', 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => false])); } } diff --git a/resources/views/partial/podcastdirectitems.blade.php b/resources/views/partial/podcastdirectitems.blade.php index 7fbd39fa..85e396ef 100644 --- a/resources/views/partial/podcastdirectitems.blade.php +++ b/resources/views/partial/podcastdirectitems.blade.php @@ -1,8 +1,8 @@
@foreach($podcasts as $podcast) url; - $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth; + $url = ($isPodcast ? '/podcast/aflevering' : '/gemist/fragment') . $podcast->url; + $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth; ?>