You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2012/10/11 21:58:52 UTC
[20/21] git commit: [#5086] avoid errors on already orphaned
BlogPostSnapshot instances
[#5086] avoid errors on already orphaned BlogPostSnapshot instances
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a0b3a366
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a0b3a366
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a0b3a366
Branch: refs/heads/cj/4942
Commit: a0b3a366fc73b33ef76fbc375709cd37879dd6d2
Parents: 349639c
Author: Dave Brondsema <db...@geek.net>
Authored: Mon Oct 8 21:31:33 2012 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Tue Oct 9 14:49:14 2012 +0000
----------------------------------------------------------------------
ForgeBlog/forgeblog/model/blog.py | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a0b3a366/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 480d9bc..50e8e1c 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -43,16 +43,25 @@ class BlogPostSnapshot(M.Snapshot):
return BlogPost.query.get(_id=self.artifact_id)
def shorthand_id(self):
- return '%s#%s' % (self.original().shorthand_id(), self.version)
+ orig = self.original()
+ if not orig:
+ return None
+ return '%s#%s' % (orig.shorthand_id(), self.version)
def url(self):
- return self.original().url() + '?version=%d' % self.version
+ orig = self.original()
+ if not orig:
+ return None
+ return orig.url() + '?version=%d' % self.version
def index(self):
+ orig = self.original()
+ if not orig:
+ return None
result = super(BlogPostSnapshot, self).index()
result.update(
title_s='Version %d of %s' % (
- self.version, self.original().shorthand_id()),
+ self.version, orig.shorthand_id()),
type_s=self.type_s,
text=self.data.text)
return result
@@ -64,11 +73,17 @@ class BlogPostSnapshot(M.Snapshot):
@property
def attachments(self):
- return self.original().attachments
+ orig = self.original()
+ if not orig:
+ return None
+ return orig.attachments
@property
def email_address(self):
- return self.original().email_address
+ orig = self.original()
+ if not orig:
+ return None
+ return orig.email_address
class BlogPost(M.VersionedArtifact, ActivityObject):
class __mongometa__: