* Song back/next buttons: Allow them to follow just the playlist

1 files changed, 7 insertions, 2 deletions

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 );
     }