Merge branch 'master' of github.com:fergalmoran/dss

This commit is contained in:
fergalmoran
2013-03-11 15:06:52 +00:00

View File

@@ -5,6 +5,12 @@ from spa.models._Activity import _Activity
class MixPlay(_Activity):
mix = models.ForeignKey('spa.Mix', related_name='plays')
def __unicode__(self):
if self.user is None:
return "%s %s %s %s" % ("Anonymous", self.get_verb_passed(), self.get_object_name(), self.date)
else:
return "%s %s %s %s" % (self.user.get_full_name, self.get_verb_passed(), self.get_object_name(), self.date)
def get_verb_passed(self):
return "played"