# HG changeset patch # User Sverre Rabbelier # Date 1239539515 0 # Node ID cec46675f866daf27d53ffecff6d8b6a45f40bdf # Parent 79bb965e723aee5ccb58e7c7135ddf0f33d59957 Send out notifications and emails to admin and backup admin Patch by: Sverre Rabbelier diff -r 79bb965e723a -r cec46675f866 app/soc/logic/helper/notifications.py --- a/app/soc/logic/helper/notifications.py Sun Apr 12 12:31:23 2009 +0000 +++ b/app/soc/logic/helper/notifications.py Sun Apr 12 12:31:55 2009 +0000 @@ -104,8 +104,6 @@ entity : An accepted group application """ - to_user = entity.applicant - url = "http://%(host)s%(redirect)s" % { 'redirect': redirects.getApplicantRedirect(entity, {'url_name': params['group_url_name']}), @@ -126,7 +124,8 @@ template = DEF_NEW_GROUP_TEMPLATE - sendNotification(to_user, None, message_properties, subject, template) + for to in [entity.applicant, entity.backup_admin]: + sendNotification(to, None, message_properties, subject, template) def sendNewReviewNotification(to_user, review, reviewed_name, redirect_url): diff -r 79bb965e723a -r cec46675f866 app/soc/views/models/org_app.py --- a/app/soc/views/models/org_app.py Sun Apr 12 12:31:23 2009 +0000 +++ b/app/soc/views/models/org_app.py Sun Apr 12 12:31:55 2009 +0000 @@ -222,15 +222,15 @@ (sender_name, sender) = default_sender # construct the contents of the email - user_entity = app_entity.applicant - to = accounts.denormalizeAccount(user_entity.account).email() + admin_entity = app_entity.applicant + backup_entity = app_entity.backup_admin - context = {'sender': sender, - 'to': to, - 'sender_name': sender_name, - 'to_name': user_entity.name, - 'program_name': app_entity.scope.name, - 'org_app_name': app_entity.name} + context = { + 'sender': sender, + 'sender_name': sender_name, + 'program_name': app_entity.scope.name, + 'org_app_name': app_entity.name + } if status == 'accepted': # use the accepted template and subject @@ -242,8 +242,13 @@ template = params['rejected_mail_template'] context['subject'] = 'Thank you for your application' - # send out the constructed email - mail_dispatcher.sendMailFromTemplate(template, context) + for to in [admin_entity, backup_entity]: + email = accounts.denormalizeAccount(to.account).email() + context['to'] = email + context['to_name'] = to.name + + # send out the constructed email + mail_dispatcher.sendMailFromTemplate(template, context) @decorators.merge_params @decorators.check_access