diff options
| -rw-r--r-- | laravel/app/Http/Controllers/SongController.php | 7 | ||||
| -rw-r--r-- | laravel/resources/views/song.blade.php | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php index 77b2aae..a18de7a 100644 --- a/laravel/app/Http/Controllers/SongController.php +++ b/laravel/app/Http/Controllers/SongController.php @@ -19,8 +19,8 @@ class SongController extends Controller $lines = explode( "\n", $song['text'] ); $newText = ''; $transp = $request->transp ?? 0; - if ($request->key && $song->key){ - $try = $this->keydiff($song->key, $request->key); + if ($request->key && $song->plain_key){ + $try = $this->keydiff($song->plain_key, $request->key); if ($try !== null){ $transp = $try; } @@ -33,7 +33,7 @@ class SongController extends Controller } $class = ! isset( $song['key'] ) ? "tabs chord$transp" - : "tabs chord" . $this->transpadd( $song['key'], $transp ); + : "tabs chord" . $this->transpadd( $song->plain_key, $transp ); $line = str_replace( array('{','}'), array('</b>{', "}<b class='$class'>" ), @@ -49,6 +49,7 @@ class SongController extends Controller $params = [ 'song' => $song, 'transp' => $transp, + 'key' => $this->transpadd( $song->plain_key, $transp ), ]; $playlist = NULL; diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php index 6dfe409..0a7a757 100644 --- a/laravel/resources/views/song.blade.php +++ b/laravel/resources/views/song.blade.php @@ -65,9 +65,9 @@ @foreach ($suggestions as $sug) <div class='controlArea'> <a class='but' href='{{route('song.suggested', ['song' => $sug, 'from' => $song])}}'>{{$sug->name}}</a> - @if ($song->plain_key) - <a class='but' href='{{route('song.suggested', ['song' => $sug, 'from' => $song, 'key' => $song->plain_key])}}'> - transposed to {{$song->plain_key}} + @if ($key && $sug->key) + <a class='but' href='{{route('song.suggested', ['song' => $sug, 'from' => $song, 'key' => $key])}}'> + transposed to {{$key}} </a> @endif </div> |