From fa336a55266650b2f1847194130dc097f4e614dd Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Fri, 28 Dec 2018 15:30:01 -0500 Subject: * Song back/next buttons: Allow them to follow just the playlist --- laravel/app/Http/Controllers/SongController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'laravel/app/Http/Controllers') diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php index 9d580ac..60b3e67 100644 --- a/laravel/app/Http/Controllers/SongController.php +++ b/laravel/app/Http/Controllers/SongController.php @@ -47,9 +47,14 @@ class SongController extends Controller $playlist = NULL; if ( isset($_GET['playlist']) && $playlist = Playlist::find($_GET['playlist'] ) ){ $params['playlist'] = $playlist; + // TODO: Allow playlists to be re-ordered + $params['back'] = $playlist->songs()->where('song_id', '<', $song->id)->orderBy('id', 'desc')->first(); + $params['next'] = $playlist->songs()->where('song_id', '>', $song->id)->orderBy('id', 'asc' )->first(); + } + else { + $params['back'] = Song::where('id', '<', $song->id)->orderBy('id', 'desc')->first(); + $params['next'] = Song::where('id', '>', $song->id)->orderBy('id', 'asc' )->first(); } - $params['back'] = Song::where('id', '<', $song->id)->orderBy('id', 'desc')->first(); - $params['next'] = Song::where('id', '>', $song->id)->orderBy('id', 'asc' )->first(); return view('song', $params ); } -- cgit 1.4.1