diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index 89d9eaadd..ef07b68d9 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -528,7 +528,7 @@ def send_interim_approval_request(meetings): group = meetings[0].session_set.first().group requester = meetings[0].session_set.first().requested_by (to_email, cc_list) = gather_address_lists('session_requested',group=group,person=requester) - from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org') + from_email = (settings.SESSION_REQUEST_FROM_EMAIL) subject = '{group} - New Interim Meeting Request'.format(group=group.acronym) template = 'meeting/interim_approval_request.txt' approval_urls = [] @@ -554,7 +554,7 @@ def send_interim_announcement_request(meeting): group = meeting.session_set.first().group requester = meeting.session_set.first().requested_by (to_email, cc_list) = gather_address_lists('interim_approved') - from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org') + from_email = (settings.SESSION_REQUEST_FROM_EMAIL) subject = '{group} - interim meeting ready for announcement'.format(group=group.acronym) template = 'meeting/interim_announcement_request.txt' announce_url = settings.IDTRACKER_BASE_URL + reverse('ietf.meeting.views.interim_request_details', kwargs={'number': meeting.number}) diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index 5c6d56124..92af5eae3 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -1,5 +1,6 @@ import datetime +from django.conf import settings from django.contrib import messages from django.db.models import Q from django.http import Http404 @@ -22,8 +23,6 @@ from ietf.mailtrigger.utils import gather_address_lists # ------------------------------------------------- # Globals # ------------------------------------------------- -#TODO: DELETE -SESSION_REQUEST_EMAIL = 'session-request@ietf.org' AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','IAB Group Chair','Area Director','Secretariat','Team Chair','IRTF Chair') # ------------------------------------------------- @@ -115,7 +114,7 @@ def send_notification(group,meeting,login,session,action): action argument is a string [new|update]. ''' (to_email, cc_list) = gather_address_lists('session_requested',group=group,person=login) - from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org') + from_email = (settings.SESSION_REQUEST_FROM_EMAIL) subject = '%s - New Meeting Session Request for IETF %s' % (group.acronym, meeting.number) template = 'sreq/session_request_notification.txt' @@ -209,11 +208,10 @@ def cancel(request, acronym): # send notifitcation (to_email, cc_list) = gather_address_lists('session_request_cancelled',group=group,person=login) - from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org') + from_email = (settings.SESSION_REQUEST_FROM_EMAIL) subject = '%s - Cancelling a meeting request for IETF %s' % (group.acronym, meeting.number) send_mail(request, to_email, from_email, subject, 'sreq/session_cancel_notification.txt', - {'login':login, - 'group':group, + {'requester':get_requester_text(login,group), 'meeting':meeting}, cc=cc_list) messages.success(request, 'The %s Session Request has been canceled' % group.acronym) @@ -605,7 +603,7 @@ def no_session(request, acronym): # send notification (to_email, cc_list) = gather_address_lists('session_request_not_meeting',group=group,person=login) - from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org') + from_email = (settings.SESSION_REQUEST_FROM_EMAIL) subject = '%s - Not having a session at IETF %s' % (group.acronym, meeting.number) send_mail(request, to_email, from_email, subject, 'sreq/not_meeting_notification.txt', {'login':login, diff --git a/ietf/settings.py b/ietf/settings.py index 0b494b41c..339e0d53b 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -612,9 +612,11 @@ HTMLIZER_VERSION = 1 HTMLIZER_URL_PREFIX = "/doc/html" HTMLIZER_CACHE_TIME = 60*60*24*14 # 14 days +# Email settings IPR_EMAIL_FROM = 'ietf-ipr@ietf.org' AUDIO_IMPORT_EMAIL = ['agenda@ietf.org','ietf@meetecho.com'] IANA_EVAL_EMAIL = "drafts-eval@icann.org" +SESSION_REQUEST_FROM_EMAIL = 'IETF Meeting Session Request Tool ' # Put real password in settings_local.py IANA_SYNC_PASSWORD = "secret"