* Editing songs: Return to same playlist after editing a song

3 files changed, 3 insertions, 2 deletions

diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php
index 1041408..9d580ac 100644
--- a/laravel/app/Http/Controllers/SongController.php
+++ b/laravel/app/Http/Controllers/SongController.php
@@ -198,6 +198,6 @@ class SongController extends Controller
         $song->text   = $_POST['text'];//request->text strips whitespace.
         $song->verse  = $request->verse;
         $song->save();
-        return redirect()->route( 'song.show', ['song' => $song ] );
+        return redirect()->route( 'song.show', ['song' => $song, 'playlist' => $request->playlistReturn ] );
     }
 }
diff --git a/laravel/resources/views/editsong.blade.php b/laravel/resources/views/editsong.blade.php
index 7ca2115..8bc7d22 100644
--- a/laravel/resources/views/editsong.blade.php
+++ b/laravel/resources/views/editsong.blade.php
@@ -4,6 +4,7 @@
 @section('content')
 
     <form method="POST" action="{{ route('song.show',['song'=>$song]) }}">
+        <input name='playlistReturn' hidden value='{{$_GET['playlist'] ?? ''}}'/>
         @csrf
         <input name='title' placeholder='title' type='text' value='{{$song->title}}'/>
         <input name='author' placeholder='author' type='text' value='{{$song->author}}'/>
diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php
index 6c34871..4812bc3 100644
--- a/laravel/resources/views/song.blade.php
+++ b/laravel/resources/views/song.blade.php
@@ -35,7 +35,7 @@
         Scripture: {{$song->verse}}<br/>
     @endif
     @can('update', $song )
-        <a href='{{ route( 'song.edit', $song ) }}'>edit this song</a>
+        <a href='{{ route( 'song.edit', ['song' => $song, 'playlist' => $playlist ?? ''] ) }}'>edit this song</a>
     @endcan
 
     <form>