kallithea Changeset - cf665eb84d4c

Changeset - cf665eb84d4c

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-03-04 12:12:38
marcin@python-works.com

notification model should only send html emails not generating multipart ones

2 files changed with 5 insertions and 4 deletions:

rhodecode/lib/celerylib/tasks.py

rhodecode/model/notification.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -251,13 +251,13 @@ def get_commits_stats(repo_name, ts_min_ @@
         log.info('LockHeld')
         return 'Task with key %s already running' % lockkey
 @task(ignore_result=True)
 @dbsession
 def send_email(recipients, subject, body, html_body=''):
+def send_email(recipients, subject, body='', html_body=''):
     """
     Sends an email with defined parameters from the .ini files.
     :param recipients: list of recipients, it this is empty the defined email
         address from field 'email_to' is used instead
     :param subject: subject of the mail
@@ @@ -279,13 +279,13 @@ def send_email(recipients, subject, body @@
     user = email_config.get('smtp_username')
     passwd = email_config.get('smtp_password')
     mail_server = email_config.get('smtp_server')
     mail_port = email_config.get('smtp_port')
     tls = str2bool(email_config.get('smtp_use_tls'))
     ssl = str2bool(email_config.get('smtp_use_ssl'))
-    debug = str2bool(config.get('debug'))
+    debug = str2bool(email_config.get('debug'))
     smtp_auth = email_config.get('smtp_auth')
     if not mail_server:
         log.error("SMTP mail server not configured - cannot send mail")
         return False

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -106,15 +106,16 @@ class NotificationModel(BaseModel): @@
         #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:
             if not email_subject:
                 email_subject = NotificationModel().make_description(notif, show_age=False)
                 email_subject = NotificationModel()\
                                     .make_description(notif, show_age=False)
             type_ = type_
             email_body = body
+            email_body = None  # we set body to none, we just send HTML emails
             ## this is passed into template
             kwargs = {'subject': subject, 'body': h.rst_w_mentions(body)}
             kwargs.update(email_kwargs)
             email_body_html = EmailNotificationModel()\
                                 .get_email_tmpl(type_, **kwargs)

0 comments (0 inline, 0 general)