X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/9fb50c56dfb3588d8694c3d06061ec40572b8002..8c48dda3b4c5cf0ac6c2d404ae29d8ef315b4f7f:/models.py diff --git a/models.py b/models.py index 39f166c..f866ee6 100644 --- a/models.py +++ b/models.py @@ -213,7 +213,10 @@ class InheritableTreeEntity(TreeEntity): @property def instance(self): - return self.instance_type.get_object_for_this_type(id=self.id) + try: + return self.instance_type.get_object_for_this_type(id=self.id) + except: + return None def get_path(self, pathsep='/', field='slug'): path = getattr(self.instance, field, '?') @@ -399,7 +402,7 @@ class ContentReference(models.Model): page = models.ForeignKey(Page, related_name='contentreferences') name = models.CharField(max_length=255) content_type = models.ForeignKey(ContentType, verbose_name='Content type') - content_id = models.PositiveIntegerField(verbose_name='Content ID') + content_id = models.PositiveIntegerField(verbose_name='Content ID', blank=True, null=True) content = generic.GenericForeignKey('content_type', 'content_id') def __unicode__(self):