Adapt session notify email based on submission count

Since we *know* if the user has submitted more than one session, we can
easily adapt the notification emails to exclude the part about "if you
have made multiple submissions" if they haven't.

diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py
index 2f493afac999c6f217a4f8aed83ddf0aa52021b4..30bab7a32dc941df5447ddf9b593ab226bc5283c 100644 (file)
--- a/postgresqleu/confreg/views.py
+++ b/postgresqleu/confreg/views.py
@@ -2055,6 +2055,7 @@ def _send_session_notification(session):
                     'conference': session.conference,
                     'session': session,
                     'speaker': spk,
+                    'has_multiple_sessions': spk.conferencesession_set.filter(conference=session.conference).exclude(pk=session.pk).exists(),
                     'has_track_selection': session.conference.track_set.filter(incfp=True).count() > 0,
                 },
                 receivername=spk.fullname,

diff --git a/template.jinja/confreg/mail/session_notify_approved.txt b/template.jinja/confreg/mail/session_notify_approved.txt
index e90c826c485c0dd759f4c910219ceeb2fe194f95..9e6b0f46d5165b09e0ccca3cf75437855ba1089d 100644 (file)
--- a/template.jinja/confreg/mail/session_notify_approved.txt
+++ b/template.jinja/confreg/mail/session_notify_approved.txt
@@ -19,8 +19,10 @@ of the description of the talk or the speaker(s), please contact the
 conference organizers *immediately*, so the changes can be made and
 the submission re-evaluated based on the new information.
 
-If you have made more than one submission to the conference,
+{% if has_multiple_sessions %}
+Since you have made more than one submission to the conference,
 please note that this status only affects this specific session.
 To view the status of all your sessions, please view the website
 
 {{sitebase}}/events/{{conference.urlname}}/callforpapers/
+{% endif %}

diff --git a/template.jinja/confreg/mail/session_notify_notaccepted.txt b/template.jinja/confreg/mail/session_notify_notaccepted.txt
index 4f8ec5d2802ec5a0d00558074a888e270c740213..354296e1bd0a47403817e5ca1799284c556b8a32 100644 (file)
--- a/template.jinja/confreg/mail/session_notify_notaccepted.txt
+++ b/template.jinja/confreg/mail/session_notify_notaccepted.txt
@@ -9,8 +9,10 @@ submitted to {{conference}} has been updated.
 Unfortunately, we have not been able to accept this session. We
 do hope to see you at {{conference}} regardless!
 
-If you have made more than one submission to the conference,
+{% if has_multiple_sessions %}
+Since you have made more than one submission to the conference,
 please note that this status only affects this specific session.
 To view the status of all your sessions, please view the website
 
 {{sitebase}}/events/{{conference.urlname}}/callforpapers/
+{% endif %}

diff --git a/template.jinja/confreg/mail/session_notify_pending.txt b/template.jinja/confreg/mail/session_notify_pending.txt
index 376f8290ffbbcfd5cd130eeb8b2506fe2a704a2a..05d7dcbc2349eef89926967ab22d7db3a81afc5f 100644 (file)
--- a/template.jinja/confreg/mail/session_notify_pending.txt
+++ b/template.jinja/confreg/mail/session_notify_pending.txt
@@ -24,8 +24,10 @@ page as where you confirm your session.
 {%endif%}
 Thank you, and we look forward to seeing you at {{conference}}.
 
-If you have made more than one submission to the conference,
+{% if has_multiple_sessions %}
+Since you have made more than one submission to the conference,
 please note that this status only affects this specific session.
 To view the status of all your sessions, please view the website
 
 {{sitebase}}/events/{{conference.urlname}}/callforpapers/
+{% endif %}

diff --git a/template.jinja/confreg/mail/session_notify_pendreserve.txt b/template.jinja/confreg/mail/session_notify_pendreserve.txt
index c0395061a17c6c6fb687ad44aacdd2cf75213031..8931ba22b6af308d17dfa153f2e5ed980ba992e3 100644 (file)
--- a/template.jinja/confreg/mail/session_notify_pendreserve.txt
+++ b/template.jinja/confreg/mail/session_notify_pendreserve.txt
@@ -27,8 +27,10 @@ to this email.
 Also, if you do not wish for your session to be used for the reserve
 list, please let us know by responding to this email.
 
-If you have made more than one submission to the conference,
+{% if has_multiple_sessions %}
+Since you have made more than one submission to the conference,
 please note that this status only affects this specific session.
 To view the status of all your sessions, please view the website
 
 {{sitebase}}/events/{{conference.urlname}}/callforpapers/
+{% endif %}

diff --git a/template.jinja/confreg/mail/session_notify_reserve.txt b/template.jinja/confreg/mail/session_notify_reserve.txt
index 073a334c225a144aa483388638b4ba830645b635..27f2f77557379e86b987c1ca645223f5881705c1 100644 (file)
--- a/template.jinja/confreg/mail/session_notify_reserve.txt
+++ b/template.jinja/confreg/mail/session_notify_reserve.txt
@@ -9,8 +9,10 @@ submitted to {{conference}} has been updated.
 The session is currently on the reserve list. If you have any questions
 about what this means, please contact the conference organizers.
 
-If you have made more than one submission to the conference,
+{% if has_multiple_sessions %}
+Since you have made more than one submission to the conference,
 please note that this status only affects this specific session.
 To view the status of all your sessions, please view the website
 
 {{sitebase}}/events/{{conference.urlname}}/callforpapers/
+{% endif %}

diff --git a/template.jinja/confreg/mail/session_notify_submitted.txt b/template.jinja/confreg/mail/session_notify_submitted.txt
index 90644c5ba9ae43c26aea62128bb10d04b637aead..c930715a07c5b580cb78cd09af91bb815ca6111e 100644 (file)
--- a/template.jinja/confreg/mail/session_notify_submitted.txt
+++ b/template.jinja/confreg/mail/session_notify_submitted.txt
@@ -9,8 +9,10 @@ submitted to {{conference}} has been updated.
 The session has been returned to "submitted" status. Please wait
 for further information from the organizers.
 
-If you have made more than one submission to the conference,
+{% if has_multiple_sessions %}
+Since you have made more than one submission to the conference,
 please note that this status only affects this specific session.
 To view the status of all your sessions, please view the website
 
 {{sitebase}}/events/{{conference.urlname}}/callforpapers/
+{% endif %}

diff --git a/template.jinja/confreg/mail/session_notify_withdrawn.txt b/template.jinja/confreg/mail/session_notify_withdrawn.txt
index ac8c4c55bc5d5636bac390eab82a39e26d86597b..553eed837b069c2e017b798f3bdf42ca7d9f1741 100644 (file)
--- a/template.jinja/confreg/mail/session_notify_withdrawn.txt
+++ b/template.jinja/confreg/mail/session_notify_withdrawn.txt
@@ -10,8 +10,10 @@ We have noted you have withdrawn this session, and will not be putting
 it on the schedule. We do hope to see you at
 {{conference}} regardless!
 
-If you have made more than one submission to the conference,
+{% if has_multiple_sessions %}
+Since you have made more than one submission to the conference,
 please note that this status only affects this specific session.
 To view the status of all your sessions, please view the website
 
 {{sitebase}}/events/{{conference.urlname}}/callforpapers/
+{% endif %}