Revision d59f5608 snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
155 | 155 |
send_mail(_(astakos_messages.HELPDESK_NOTIFICATION_EMAIL_SUBJECT) % |
156 | 156 |
{'user': user.email}, |
157 | 157 |
message, sender, recipient_list, connection=get_connection()) |
158 |
msg = 'Sent helpdesk admin notification for %s' % user.email
|
|
159 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
158 |
msg = 'Sent helpdesk admin notification for %s' |
|
159 |
logger.log(settings.LOGGING_LEVEL, msg, user.email)
|
|
160 | 160 |
|
161 | 161 |
|
162 | 162 |
def send_invitation(invitation, template_name='im/invitation.txt'): |
... | ... | |
175 | 175 |
sender = settings.SERVER_EMAIL |
176 | 176 |
send_mail(subject, message, sender, [invitation.username], |
177 | 177 |
connection=get_connection()) |
178 |
msg = 'Sent invitation %s' % invitation
|
|
179 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
178 |
msg = 'Sent invitation %s' |
|
179 |
logger.log(settings.LOGGING_LEVEL, msg, invitation)
|
|
180 | 180 |
inviter_invitations = invitation.inviter.invitations |
181 | 181 |
invitation.inviter.invitations = max(0, inviter_invitations - 1) |
182 | 182 |
invitation.inviter.save() |
... | ... | |
199 | 199 |
sender = settings.SERVER_EMAIL |
200 | 200 |
send_mail(subject, message, sender, [user.email], |
201 | 201 |
connection=get_connection()) |
202 |
msg = 'Sent greeting %s' % user.log_display
|
|
203 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
202 |
msg = 'Sent greeting %s' |
|
203 |
logger.log(settings.LOGGING_LEVEL, msg, user.log_display)
|
|
204 | 204 |
|
205 | 205 |
|
206 | 206 |
def send_feedback(msg, data, user, email_template_name='im/feedback_mail.txt'): |
... | ... | |
213 | 213 |
'user': user}) |
214 | 214 |
send_mail(subject, content, from_email, recipient_list, |
215 | 215 |
connection=get_connection()) |
216 |
msg = 'Sent feedback from %s' % user.log_display
|
|
217 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
216 |
msg = 'Sent feedback from %s' |
|
217 |
logger.log(settings.LOGGING_LEVEL, msg, user.log_display)
|
|
218 | 218 |
|
219 | 219 |
|
220 |
def send_change_email( |
|
221 |
ec, request, email_template_name='registration/email_change_email.txt'): |
|
220 |
def send_change_email(ec, request, |
|
221 |
email_template_name= |
|
222 |
'registration/email_change_email.txt'): |
|
222 | 223 |
url = ec.get_url() |
223 | 224 |
url = request.build_absolute_uri(url) |
224 |
c = {'url': url, 'site_name': settings.SITENAME, 'support': settings.CONTACT_EMAIL,
|
|
225 |
'ec': ec} |
|
225 |
c = {'url': url, 'site_name': settings.SITENAME, |
|
226 |
'support': settings.CONTACT_EMAIL, 'ec': ec}
|
|
226 | 227 |
message = render_to_string(email_template_name, c) |
227 | 228 |
from_email = settings.SERVER_EMAIL |
228 | 229 |
send_mail(_(astakos_messages.EMAIL_CHANGE_EMAIL_SUBJECT), message, |
229 | 230 |
from_email, |
230 | 231 |
[ec.new_email_address], connection=get_connection()) |
231 |
msg = 'Sent change email for %s' % ec.user.log_display
|
|
232 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
232 |
msg = 'Sent change email for %s' |
|
233 |
logger.log(settings.LOGGING_LEVEL, msg, ec.user.log_display)
|
|
233 | 234 |
|
234 | 235 |
|
235 | 236 |
def invite(inviter, email, realname): |
Also available in: Unified diff