diff --git a/application/config/routes.php b/application/config/routes.php index a61312b..2a97884 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -54,6 +54,10 @@ $route['404_override'] = ''; $route['translate_uri_dashes'] = FALSE; $route['albums'] = 'albums/index'; + +$route['artistes/view/(:num)'] = 'artistes/view/$1'; + + $route['connect/login'] = 'connect/login'; $route['connect/logout'] = 'connect/logout'; $route['connect/create'] = 'connect/create'; diff --git a/application/controllers/Artistes.php b/application/controllers/Artistes.php index ddd24d0..a7790ec 100644 --- a/application/controllers/Artistes.php +++ b/application/controllers/Artistes.php @@ -46,3 +46,4 @@ class Artistes extends CI_Controller { } } + diff --git a/application/models/Model_music.php b/application/models/Model_music.php index af2caf9..b7fc131 100644 --- a/application/models/Model_music.php +++ b/application/models/Model_music.php @@ -127,8 +127,8 @@ class Model_music extends CI_Model { // Get artist info $this->db->select('artist.name as artistName, artist.id, genre.name as genreName, artist.jpeg'); $this->db->from('artist'); - $this->db->join('album', 'album.artistid = artist.id'); - $this->db->join('genre', 'genre.id = album.genreid', 'left'); + $this->db->join('album', 'album.artistid = artist.id', 'left'); + $this->db->join('genre', 'album.genreid = genre.id', 'left'); $this->db->where('artist.id', $artistId); $artistQuery = $this->db->get(); $artistDetails = $artistQuery->row(); @@ -143,6 +143,7 @@ class Model_music extends CI_Model { return array('artist' => $artistDetails, 'albums' => $albums); } + public function getSongDetails($songId) { // Get song details $this->db->select('song.name as songName, track.id as trackId, album.name as albumName, album.year, artist.name as artistName, genre.name as genreName, cover.jpeg');