You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/09/02 22:58:55 UTC
[06/25] allura git commit: [#7822] ticket:849 Do not generate
activity when editing draft blog posts
[#7822] ticket:849 Do not generate activity when editing draft blog posts
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/956e7d74
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/956e7d74
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/956e7d74
Branch: refs/heads/db/7955
Commit: 956e7d74f0ba39591b170d95ee3c185c6ef0da2c
Parents: 80f4f45
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Mon Aug 31 15:08:40 2015 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 1 14:55:23 2015 +0000
----------------------------------------------------------------------
ForgeBlog/forgeblog/model/blog.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/956e7d74/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index c8426cb..41b9f1b 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -253,14 +253,15 @@ class BlogPost(M.VersionedArtifact, ActivityObject):
description = self.text
subject = '%s created post %s' % (
c.user.username, self.title)
- elif v1.title != v2.title:
- activity('renamed', self)
- subject = '%s renamed post %s to %s' % (
- c.user.username, v1.title, v2.title)
- else:
- activity('modified', self)
- subject = '%s modified post %s' % (
- c.user.username, self.title)
+ elif v2.state == 'published':
+ if v1.title != v2.title:
+ activity('renamed', self)
+ subject = '%s renamed post %s to %s' % (
+ c.user.username, v1.title, v2.title)
+ else:
+ activity('modified', self)
+ subject = '%s modified post %s' % (
+ c.user.username, self.title)
else:
description = self.text
subject = '%s created post %s' % (