diff --git a/application/controllers/Music.php b/application/controllers/Music.php
index 42bd88a..443b4a2 100644
--- a/application/controllers/Music.php
+++ b/application/controllers/Music.php
@@ -34,12 +34,13 @@ class Music extends CI_Controller {
}
public function view($songId) {
- $songData = $this->model_music->getArtistDetails($songId);
+ $songData = $this->model_music->getSongDetails($songId);
$is_logged_in = $this->session->userdata('logged_in');
$data = array(
+ 'song' => $songData['song'],
+ 'album' => $songData['album'],
'artist' => $songData['artist'],
- 'albums' => $songData['albums'],
'is_logged_in' => $is_logged_in
);
@@ -47,5 +48,7 @@ class Music extends CI_Controller {
$this->load->view('song_details', $data);
$this->load->view('layout/footer');
}
+
+
}
diff --git a/application/views/musiques_list.php b/application/views/musiques_list.php
index a8ac66f..cf15adf 100644
--- a/application/views/musiques_list.php
+++ b/application/views/musiques_list.php
@@ -4,7 +4,8 @@
foreach($musics as $music){
echo "<div><article>";
echo "<header class='short-text'>";
- echo anchor("albums/view/{$music->trackId}","{$music->trackName}");
+ <?= anchor("music/view/{$song->trackId}", $song->albumName) ?>
+
echo "</header>";
echo '<img src="data:image/jpeg;base64,'.base64_encode($music->jpeg).'" />';
diff --git a/application/views/song_details.php b/application/views/song_details.php
index 1add29f..ae7c2de 100644
--- a/application/views/song_details.php
+++ b/application/views/song_details.php
@@ -5,7 +5,7 @@
</head>
<body>
<h1><?= $song['songName'] ?></h1>
- <p><strong>Album:</strong> <?= anchor("music/view/{$song['albumId']}", $song['albumName']) ?> (<?= $song['year'] ?>)</p>
+ <p><strong>Album:</strong> <?= anchor("albums/view/{$song['albumId']}", $song['albumName']) ?> (<?= $song['year'] ?>)</p>
<p><strong>Artist:</strong> <?= $song['artistName'] ?></p>
<p><strong>Genre:</strong> <?= $song['genreName'] ?></p>
<?php if(isset($song['jpeg']) && $song['jpeg'] != ''): ?>