diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html index beb3695d..b3d9ad2a 100644 --- a/data/interfaces/default/artist.html +++ b/data/interfaces/default/artist.html @@ -43,7 +43,7 @@

- ${artist['ArtistName']} + ${artist['ArtistName']}

@@ -236,10 +236,12 @@ function checkArtistStatus() { $.ajax({ - url: "getArtistStatus?ArtistID=${artist['ArtistID']}", + url: "getArtistjson?ArtistID=${artist['ArtistID']}", + dataType: "jsonp", complete: function(result) { - if (result.responseText == "Loading"){ + if (result.Status == "Loading"){ refreshTable(); + $('#artistnamelink').text(result.ArtistName); if (loadingMessage == false){ showMsg("Getting artist information",true); loadingMessage = true; diff --git a/headphones/webserve.py b/headphones/webserve.py index 81b06f8a..6db4c1f3 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -854,11 +854,15 @@ class WebInterface(object): return json_albums getAlbumsByArtist_json.exposed=True - def getArtistStatus(self, ArtistID): + def getArtistjson(self, ArtistID, **kwargs): myDB = db.DBConnection() - artist = myDB.action('SELECT Status FROM artists WHERE ArtistID=?', [ArtistID]).fetchone() - return artist['Status'] - getArtistStatus.exposed=True + artist = myDB.action('SELECT * FROM artists WHERE ArtistID=?', [ArtistID]).fetchone() + artist_json = json.dumps({ + 'ArtistName': artist['ArtistName'], + 'Status': artist['Status'] + }) + return artist_json + getArtistjson.exposed=True def clearhistory(self, type=None, date_added=None, title=None): myDB = db.DBConnection()