X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=data%2Fmodels.py;h=11bdc59aae60d0dda35445ef7bae0b694c1687a2;hb=8e8d2a6c4e4beb9487e9e168d5e43706eea3da1d;hp=58bb974437452aae74cbca6d3a812cf064735e0a;hpb=f1dbafd464ea40d7c487a054a8af94c3e3e2b5a9;p=demoscenemusic.git

diff --git a/data/models.py b/data/models.py
index 58bb974..11bdc59 100644
--- a/data/models.py
+++ b/data/models.py
@@ -15,7 +15,7 @@ class Artist(models.Model):
 	groups = models.ManyToManyField(Group)
 
 	def __unicode__(self):
-		return self.name
+		return "%s%s" % (self.name, (" / %s" % (" ^ ".join(g.shortName if (g.shortName != '') else g.name for g in self.groups.all()), )))
 
 class Party(models.Model):
 	name = models.CharField(max_length = 80)
@@ -46,7 +46,7 @@ class TrackArtist(models.Model):
 	order = models.IntegerField()
 
 	def __unicode__(self):
-		return self.artist.name
+		return self.artist.__unicode__()
 
 	class Meta:
 		ordering = ['order']
@@ -57,7 +57,7 @@ class RemixArtist(models.Model):
 	order = models.IntegerField()
 
 	def __unicode__(self):
-		return self.artist.name
+		return self.artist.__unicode__()
 
 	class Meta:
 		ordering = ['order']
@@ -73,7 +73,7 @@ class Track(models.Model):
 
 	def __unicode__(self):
 		#return '%s – %s%s' % (' & '.join(self.artists), self.name, (('%s by %s' % (self.remix, ' & '.join(self.remixArtists) + ')')) if (self.remix != '') else ''))
-		return u'{1} – {0}'.format(self.name, ' & '.join(a.name for a in self.artists.all()))
+		return u'{1} – {0}'.format(self.name, ' & '.join(a.artist.__unicode__() for a in self.trackartist_set.all()))
 
 class File(models.Model):
 	track = models.ForeignKey(Track)