Merge remote-tracking branch 'djeebus/add_description_to_artist_api' into develop

This commit is contained in:
rembo10
2014-01-13 10:44:17 +00:00

View File

@@ -123,8 +123,9 @@ class Api(object):
artist = self._dic_from_query('SELECT * from artists WHERE ArtistID="' + self.id + '"')
albums = self._dic_from_query('SELECT * from albums WHERE ArtistID="' + self.id + '" order by ReleaseDate DESC')
description = self._dic_from_query('SELECT * from descriptions WHERE ArtistID="' + self.id + '"')
self.data = { 'artist': artist, 'albums': albums }
self.data = { 'artist': artist, 'albums': albums, 'description' : description }
return
def _getAlbum(self, **kwargs):