From cd1254d6ef567c7746aacecf81e955f784d338ea Mon Sep 17 00:00:00 2001
From: Zach DeCook <zachdecook@gmail.com>
Date: Thu, 27 Dec 2018 21:50:20 -0500
Subject: * Route paths: Fix

---
 laravel/app/Http/Controllers/SongController.php | 7 ++-----
 laravel/resources/views/song.blade.php          | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'laravel')

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>
-- 
cgit 1.4.1