* Editing: Go back to same key you came from

(Also show key in song name)

4 files changed, 14 insertions, 3 deletions

diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php
index a18de7a..669ec3e 100644
--- a/laravel/app/Http/Controllers/SongController.php
+++ b/laravel/app/Http/Controllers/SongController.php
@@ -238,6 +238,10 @@ 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, 'playlist' => $request->playlistReturn ] );
+        return redirect()->route( 'song.show', [
+            'song' => $song,
+            'playlist' => $request->playlistReturn,
+            'key' => $request->keyReturn,
+        ] );
     }
 }
diff --git a/laravel/app/Song.php b/laravel/app/Song.php
index 58e2317..a71e997 100644
--- a/laravel/app/Song.php
+++ b/laravel/app/Song.php
@@ -13,7 +13,9 @@ class Song extends Model
     }
     public function getNameAttribute()
     {
-        return $this->title . ( $this->author ? " ($this->author)" : "" );
+        return $this->title
+            . ( $this->author ? " ($this->author)" : "" )
+            . ($this->plain_key ? " ($this->plain_key)" : "");
     }
     public function getPlainKeyAttribute()
     {
diff --git a/laravel/resources/views/editsong.blade.php b/laravel/resources/views/editsong.blade.php
index 8bc7d22..267f04a 100644
--- a/laravel/resources/views/editsong.blade.php
+++ b/laravel/resources/views/editsong.blade.php
@@ -5,6 +5,7 @@
 
     <form method="POST" action="{{ route('song.show',['song'=>$song]) }}">
         <input name='playlistReturn' hidden value='{{$_GET['playlist'] ?? ''}}'/>
+        <input name='keyReturn' hidden value='{{$_GET['key'] ?? ''}}'/>
         @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 6fed78b..9170144 100644
--- a/laravel/resources/views/song.blade.php
+++ b/laravel/resources/views/song.blade.php
@@ -35,7 +35,11 @@
         Scripture: {{$song->verse}}<br/>
     @endif
     @can('update', $song )
-        <a href='{{ route( 'song.edit', ['song' => $song, 'playlist' => $playlist ?? ''] ) }}'>edit this song</a>
+        <a href='{{ route( 'song.edit', [
+            'song' => $song,
+            'playlist' => $playlist ?? '',
+            'key' => $key,
+            ] ) }}'>edit this song</a>
     @endcan
 
     <form>