From 63626f81c4fcbd51c0feefdc5e49e4a2c6716dbd Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Mon, 11 Mar 2013 15:01:35 +0000 Subject: [PATCH 1/2] Updated unicode for play --- spa/models/MixPlay.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spa/models/MixPlay.py b/spa/models/MixPlay.py index 8e92fe5..346b54c 100644 --- a/spa/models/MixPlay.py +++ b/spa/models/MixPlay.py @@ -5,6 +5,9 @@ from spa.models._Activity import _Activity class MixPlay(_Activity): mix = models.ForeignKey('spa.Mix', related_name='plays') + def __unicode__(self): + 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" From d4ef08ef2970a98c06716c27993dc0f346f456fb Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Mon, 11 Mar 2013 15:05:47 +0000 Subject: [PATCH 2/2] Fixed unicode for play --- spa/models/MixPlay.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spa/models/MixPlay.py b/spa/models/MixPlay.py index 346b54c..6bb7246 100644 --- a/spa/models/MixPlay.py +++ b/spa/models/MixPlay.py @@ -6,7 +6,10 @@ class MixPlay(_Activity): mix = models.ForeignKey('spa.Mix', related_name='plays') def __unicode__(self): - return "%s %s %s %s" % (self.user.get_full_name, self.get_verb_passed(), self.get_object_name(), self.date) + 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"