Return the better artist name.

[demoscenemusic.git] / data / models.py

diff --git a/data/models.py b/data/models.py
index 283f806..f5eacf8 100644 (file)
--- 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,10 @@ class TrackArtist(models.Model):
        order = models.IntegerField()
 
        def __unicode__(self):
-               return self.artist.name
+               return self.artist.__unicode__()
+
+       class Meta:
+               ordering = ['order']
 
 class RemixArtist(models.Model):
        track = models.ForeignKey('Track')
@@ -54,7 +57,10 @@ class RemixArtist(models.Model):
        order = models.IntegerField()
 
        def __unicode__(self):
-               return self.artist.name
+               return self.artist.__unicode__()
+
+       class Meta:
+               ordering = ['order']
 
 class Track(models.Model):
        name = models.CharField(max_length = 150)