git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
32bc6b6
)
give sliver a unicode name before it is instantiated
author
Scott Baker
<smbaker@gmail.com>
Fri, 23 Aug 2013 17:28:07 +0000
(10:28 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Fri, 23 Aug 2013 17:28:07 +0000
(10:28 -0700)
planetstack/core/models/sliver.py
patch
|
blob
|
history
diff --git
a/planetstack/core/models/sliver.py
b/planetstack/core/models/sliver.py
index
44a6af1
..
9c00cee
100644
(file)
--- 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)
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:
def save(self, *args, **kwds):
if not self.name: