Added a context processor to make settings generally available in page templates. Split the SECRETARIAT_TICKET_EMAIL setting into SECRETARIAT_ACTION_EMAIL and SECRETARIAT_INFO_EMAIL, with different addresses. Updated places with hardcoded ietf-action@ietf.org addresses to use the settings value, and updated some places to use ietf-infor@ietf.org instead of the ietf-action address. Fixes issue #3081.

- Legacy-Id: 18501

ietf/context_processors.py

@@ -42,3 +42,7 @@ def sql_debug(request):
     else:
         return {'sql_debug': False }
     
+def settings_info(request):
+    return {
+        'settings': settings,
+    }

ietf/ietfauth/views.py

@@ -596,7 +596,8 @@ def change_password(request):
             # keep the session
             update_session_auth_hash(request, user)
 
-            send_mail(request, emails, None, "Datatracker password change notification", "registration/password_change_email.txt", {})
+            send_mail(request, emails, None, "Datatracker password change notification",
+                "registration/password_change_email.txt", {'action_email': settings.SECRETARIAT_ACTION_EMAIL, })
 
             messages.success(request, "Your password was successfully changed")
             return HttpResponseRedirect(urlreverse('ietf.ietfauth.views.profile'))

ietf/secr/sreq/views.py

@@ -637,7 +637,7 @@ def main(request):
 
     # warn if there are no associated groups
     if not scheduled_groups and not unscheduled_groups:
-        messages.warning(request, 'The account %s is not associated with any groups.  If you have multiple Datatracker accounts you may try another or report a problem to ietf-action@ietf.org' % request.user)
+        messages.warning(request, 'The account %s is not associated with any groups.  If you have multiple Datatracker accounts you may try another or report a problem to %s' % (request.user, settings.SECRETARIAT_ACTION_EMAIL))
      
     # add session status messages for use in template
     for group in scheduled_groups:

ietf/secr/templates/includes/upload_footer.html

@@ -1,5 +1,5 @@
     <li><a href="https://www.ietf.org/instructions/meeting_materials_tool.html" target="_blank">Instructions</a>.</li>
-    <li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.</li>
+    <li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:{{settings.SECRETARIAT_ACTION_EMAIL}}">ietf-action@ietf.org</a>.</li>
     <li>To submit your materials via email, please send agendas to <a href="mailto:agenda@ietf.org">agenda@ietf.org</a> and minutes/presentation slides to <a href="mailto:proceedings@ietf.org">proceedings@ietf.org</a>.</li>
     <li><bold>Note:</bold> Normal session materials materials management is now performed using the {% if meeting.number %}<a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">{% endif %}materials page{% if meeting.number %}</a>{% endif %}
 

ietf/settings.py

@@ -370,6 +370,7 @@ TEMPLATES = [
                 'ietf.context_processors.server_mode',
                 'ietf.context_processors.debug_mark_queries_from_view',
                 'ietf.context_processors.revision_info',
+                'ietf.context_processors.settings_info',
                 'ietf.secr.context_processors.secr_revision_info',
                 'ietf.context_processors.rfcdiff_base_url',
             ],
@@ -742,7 +743,8 @@ AUDIO_IMPORT_EMAIL = ['ietf@meetecho.com']
 IANA_EVAL_EMAIL = "drafts-eval@icann.org"
 SESSION_REQUEST_FROM_EMAIL = 'IETF Meeting Session Request Tool <session-request@ietf.org>' 
 
-SECRETARIAT_TICKET_EMAIL = "ietf-action@ietf.org"
+SECRETARIAT_ACTION_EMAIL = "ietf-action@ietf.org"
+SECRETARIAT_INFO_EMAIL = "ietf-info@ietf.org"
 
 # Put real password in settings_local.py
 IANA_SYNC_PASSWORD = "secret"

ietf/stats/views.py

@@ -755,7 +755,6 @@ def known_countries_list(request, stats_type=None, acronym=None):
 
     return render(request, "stats/known_countries_list.html", {
         "countries": countries,
-        "ticket_email_address": settings.SECRETARIAT_TICKET_EMAIL,
     })
 
 def meeting_stats(request, num=None, stats_type=None):

ietf/templates/help/personal-information.html

@@ -85,7 +85,7 @@
      <a href="/accounts/profile/">Account Info</a> page by the individual
      after logging in to the account.  If the datatracker holds such
      information about a person, and they don't have an account, a request to
-     the <a href="mailto:ietf-action@ietf.org">IETF secretariat</a> to change
+     the <a href="mailto:{{settings.SECRETARIAT_ACTION_EMAIL}}">IETF secretariat</a> to change
      or remove the information will be honoured to the extent feasible and
      legally permitted.
 

ietf/templates/registration/edit_profile.html

@@ -30,7 +30,7 @@
       dagger symbol † next to it, or listed on your
       <a href="{% url 'ietf.community.views.view_list' user.username %}">notification subscription page</a>.  Most of this
       information can be edited or removed on these page.  There are some exceptions, such
-      as photos, which currently require an email to <a href="mailto:{{settings.SECRETARIAT_TICKET_EMAIL}}">the Secretariat</a>
+      as photos, which currently require an email to <a href="mailto:{{settings.SECRETARIAT_INFO_EMAIL}}">the Secretariat</a>
       if you wish to update or remove the information.
 
   </p>

ietf/templates/registration/missing_person.html

@@ -8,7 +8,7 @@
 
   <p>
     There is no person record associated with your login.  Please
-    contact the secretariat at <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>
+    contact the secretariat at <a href="mailto:{{settings.SECRETARIAT_INFO_EMAIL}}">{{settings.SECRETARIAT_INFO_EMAIL}}</a>
     and explain the situation.
   </p>
 {% endblock %}

ietf/templates/stats/known_countries_list.html

@@ -9,7 +9,7 @@
 
   <h1>{% block title %}Countries known to the Datatracker{% endblock %}</h1>
 
-  <p>In case you think a country or an alias is missing from the list, you can <a href="mailto:{{ ticket_email_address }}">file a ticket</a>.</p>
+  <p>In case you think a country or an alias is missing from the list, you can <a href="mailto:{{ settings.SECRETARIAT_ACTION_EMAIL }}">file a ticket</a>.</p>
 
   {% if request.user.is_staff %}
     <p>Note: since you're an admin, the country names are linked to their corresponding admin page.</p>