Mercurial > kallithea

comparison rhodecode/lib/celerylib/tasks.py @ 2154:747c1c7040a8 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed email prefix sent as None
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 22 Mar 2012 02:29:43 +0200
parents 8ecfed1d8f8b
children dc2584ba5fbc eac0d6194783
comparison
equal deleted inserted replaced
2153:fa637dc3e029 2154:747c1c7040a8
326 """ 326 """
327 log = get_logger(send_email) 327 log = get_logger(send_email)
328 DBS = get_session() 328 DBS = get_session()
329 329
330 email_config = config 330 email_config = config
331 subject = "%s %s" % (email_config.get('email_prefix'), subject) 331 subject = "%s %s" % (email_config.get('email_prefix', ''), subject)
332 if not recipients: 332 if not recipients:
333 # if recipients are not defined we send to email_config + all admins 333 # if recipients are not defined we send to email_config + all admins
334 admins = [u.email for u in User.query() 334 admins = [u.email for u in User.query()
335 .filter(User.admin == True).all()] 335 .filter(User.admin == True).all()]
336 recipients = [email_config.get('email_to')] + admins 336 recipients = [email_config.get('email_to')] + admins