diff options
Diffstat (limited to 'laravel')
| -rw-r--r-- | laravel/app/Http/Controllers/SongController.php | 7 | ||||
| -rw-r--r-- | laravel/resources/views/song.blade.php | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php index 8206bca..6452f7a 100644 --- a/laravel/app/Http/Controllers/SongController.php +++ b/laravel/app/Http/Controllers/SongController.php @@ -167,10 +167,7 @@ class SongController extends Controller if ( $_POST['playlist'] ) { $song->playlists()->attach( $_POST['playlist'] ); } - return redirect()->route('song.show', [ - 'song' => $song, - 'playlist' => $_POST['playlist'] - ] ); + return redirect()->route('song.show', [ 'song' => $song, 'playlist' => $_POST['playlist'] ] ); } if ($_POST['playlist'] ){ return redirect()->route('playlist.show', [ 'playlist' => $_POST['playlist'] ] ); @@ -189,6 +186,6 @@ class SongController extends Controller $song->key = $request->key; $song->text = $request->text; $song->save(); - return redirect()->route( 'song.show', ['song' => $song->number ] ); + return redirect()->route( 'song.show', ['song' => $song ] ); } } diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php index 3d8cf2a..02f046b 100644 --- a/laravel/resources/views/song.blade.php +++ b/laravel/resources/views/song.blade.php @@ -11,7 +11,7 @@ <h2>{{$song['title']}}</h2> @can('update', $song ) - <a href='{{ route( 'song.edit', $song->number ) }}'>edit this song</a> + <a href='{{ route( 'song.edit', $song ) }}'>edit this song</a> @endcan <form> |