diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2011-11-25 17:41:42 +0200 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2011-11-25 17:41:42 +0200 |
commit | 06219e44a75d2997ddb8ed4c827a72110b45cdb6 (patch) | |
tree | 41d2557741e06f78029c0c77b17a224fd8e6d229 /rhodecode/model/comment.py | |
parent | a0fd7484c424b8c6282ec319e774985d3e94598a (diff) |
Notification fixes
- email prefix added to .ini files
- html templates emails
- rewrote email system to use some parts from pyramid_mailer
--HG--
branch : beta
rename : rhodecode/lib/smtp_mailer.py => rhodecode/lib/rcmail/smtp_mailer.py
Diffstat (limited to 'rhodecode/model/comment.py')
-rw-r--r-- | rhodecode/model/comment.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py index 887f9ecc..e835469f 100644 --- a/rhodecode/model/comment.py +++ b/rhodecode/model/comment.py @@ -87,7 +87,8 @@ class ChangesetCommentsModel(BaseModel): {'commit_desc':desc, 'line':line}, h.url('changeset_home', repo_name=repo.repo_name, revision=revision, - anchor='comment-%s' % comment.comment_id + anchor='comment-%s' % comment.comment_id, + qualified=True, ) ) body = text @@ -99,11 +100,13 @@ class ChangesetCommentsModel(BaseModel): body=body, recipients=recipients, type_=Notification.TYPE_CHANGESET_COMMENT) - mention_recipients = set(self._extract_mentions(body)).difference(recipients) + mention_recipients = set(self._extract_mentions(body))\ + .difference(recipients) if mention_recipients: subj = _('[Mention]') + ' ' + subj NotificationModel().create(created_by=user_id, subject=subj, - body = body, recipients = mention_recipients, + body=body, + recipients=mention_recipients, type_=Notification.TYPE_CHANGESET_COMMENT) self.sa.commit() |