From d80fc36b29cb6ab60be3a4d84a74d3deb8da0034 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Mon, 5 May 2014 15:40:01 -0700
Subject: [PATCH] Move to json so we can get the artist name as well

---
 data/interfaces/default/artist.html |  8 +++++---
 headphones/webserve.py              | 12 ++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

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 @@
 			<img id="artistImage" class="albumArt" alt="" src="artwork/artist/${artist['ArtistID']}"/>
 		</div>
 		<h1 id="artistname">
-			<a href="http://musicbrainz.org/artist/${artist['ArtistID']}">${artist['ArtistName']}</a>
+			<a href="http://musicbrainz.org/artist/${artist['ArtistID']}" id="artistnamelink">${artist['ArtistName']}</a>
 		</h1>
 		<div id="artistBio"></div>
 	</div>
@@ -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()