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 2014/03/04 22:11:46 UTC
[3/5] git commit: [#6305] ticket:535 Fixed empty email notifications.
[#6305] ticket:535 Fixed empty email notifications.
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/94cfe096
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/94cfe096
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/94cfe096
Branch: refs/heads/master
Commit: 94cfe096653cebecbb617a81660872470a7f2c1d
Parents: 8d507c9
Author: Ferens Dmitriy <fe...@gmail.com>
Authored: Tue Feb 25 13:57:12 2014 +0200
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Mar 4 20:32:10 2014 +0000
----------------------------------------------------------------------
Allura/allura/model/notification.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/94cfe096/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index ce92a4c..0ab15f8 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -151,7 +151,7 @@ class Notification(MappedClass):
post = ''
if topic == 'message':
post = kwargs.pop('post')
- text = kwargs.get('text', post.text)
+ text = kwargs.get('text') or post.text
file_info = kwargs.pop('file_info', None)
if file_info is not None:
text = "%s\n\n\nAttachment:" % text