From: Scott Baker Date: Fri, 23 Aug 2013 17:28:07 +0000 (-0700) Subject: give sliver a unicode name before it is instantiated X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=3015c76fb60e9184dc4e1c7b21df52e7fcf7499c give sliver a unicode name before it is instantiated --- diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py index 44a6af1..9c00cee 100644 --- a/planetstack/core/models/sliver.py +++ b/planetstack/core/models/sliver.py @@ -26,7 +26,16 @@ class Sliver(PlCoreBase): numberCores = models.IntegerField(verbose_name="Number of Cores", help_text="Number of cores for sliver", default=0) tags = generic.GenericRelation(Tag) - def __unicode__(self): return u'%s' % (self.instance_name) + def __unicode__(self): + if self.instance_name: + return u'%s' % (self.instance_name) + elif self.id: + return u'uninstantiated-%s' % str(self.id) + elif self.slice: + return u'unsaved-sliver on %s' % self.slice.name + else: + return u'unsaved-sliver' + def save(self, *args, **kwds): if not self.name: