kallithea Changeset - 7d517a35b6c9

Changeset - 7d517a35b6c9

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-06-04 22:03:40
marcin@python-works.com

Don't send emails to person who comment on changeset

2 files changed with 6 insertions and 2 deletions:

rhodecode/model/comment.py

rhodecode/model/notification.py

0 comments (0 inline, 0 general)

rhodecode/model/comment.py

➞

Show inline comments

@@ @@ -93,24 +93,25 @@ class ChangesetCommentsModel(BaseModel): @@
+                          )
+                )
+            )
             body = text
             # get the current participants of this changeset
             recipients = ChangesetComment.get_users(revision=revision)
             # add changeset author if it's in rhodecode system
             recipients += [User.get_by_email(author_email)]
             # create notification objects, and emails
             NotificationModel().create(
               created_by=user_id, subject=subj, body=body,
               recipients=recipients, type_=Notification.TYPE_CHANGESET_COMMENT
+            )
             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,

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -94,26 +94,29 @@ class NotificationModel(BaseModel): @@
             recipients_objs = User.query().filter(User.admin == True).all()
             log.debug('sending notifications %s to admins: %s' % (
                 type_, recipients_objs)
+            )
         notif = Notification.create(
             created_by=created_by_obj, subject=subject,
             body=body, recipients=recipients_objs, type_=type_
+        )
         if with_email is False:
             return notif
         # send email with notification
         for rec in recipients_objs:
         #don't send email to person who created this comment
         rec_objs = set(recipients_objs).difference(set([created_by_obj]))
         # send email with notification to all other participants
         for rec in rec_objs:
             email_subject = NotificationModel().make_description(notif, False)
             type_ = type_
             email_body = body
             kwargs = {'subject': subject, 'body': h.rst_w_mentions(body)}
             kwargs.update(email_kwargs)
             email_body_html = EmailNotificationModel()\
                                 .get_email_tmpl(type_, **kwargs)
             run_task(tasks.send_email, rec.email, email_subject, email_body,
                      email_body_html)
         return notif

0 comments (0 inline, 0 general)