From: Scott Baker Date: Mon, 19 Jan 2015 00:08:06 +0000 (-0800) Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=87f730f41674363eccb19f3f8eb29794c9e038d8;hp=9d25b6fbf572e12afb5ccd5562be1b24661d5f0a Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi --- diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py index de0ff84..4d89d9f 100644 --- a/planetstack/core/models/sliver.py +++ b/planetstack/core/models/sliver.py @@ -106,7 +106,7 @@ class Sliver(PlCoreBase): return u'unsaved-sliver' def save(self, *args, **kwds): - self.name = self.slice.slicename + self.name = self.slice.name if not self.creator and hasattr(self, 'caller'): self.creator = self.caller