@@ -44,13 +44,13 @@ from rhodecode.lib.helpers import person
from rhodecode.lib.smtp_mailer import SmtpMailer
from rhodecode.lib.utils import add_cache
from rhodecode.lib.compat import json, OrderedDict
from rhodecode.model import init_model
from rhodecode.model import meta
from rhodecode.model.db import RhodeCodeUi, Statistics, Repository
from rhodecode.model.db import RhodeCodeUi, Statistics, Repository, User
from vcs.backends import get_repo
from sqlalchemy import engine_from_config
add_cache(config)
@@ -343,13 +343,15 @@ def send_email(recipients, subject, body
except:
log = logging.getLogger(__name__)
email_config = config
if not recipients:
recipients = [email_config.get('email_to')]
# if recipients are not defined we send to email_config + all admins
admins = [u.email for u in User.query().filter(User.admin==True).all()]
recipients = [email_config.get('email_to')] + admins
mail_from = email_config.get('app_email_from')
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')
Status change: