Compose the mail with the questionnaire using the header template and the questionnaire template. See ietf-tools#913, ietf-tools#929

 - Legacy-Id: 5599

Author: emiliosanchez

ietf/nomcom/decorators.py

@@ -12,8 +12,6 @@ def _is_nomcom_member(user, *args, **kwargs):
         year = kwargs.get('year', None)
         if year:
             nomcom = get_nomcom_by_year(year=year)
-            if has_role(user, "Secretariat"):
-                return True
             if role == 'chair':
                 return nomcom.group.is_chair(user)
             else:

ietf/nomcom/forms.py

@@ -14,7 +14,7 @@
 
 from ietf.dbtemplate.forms import DBTemplateForm
 from ietf.utils import unaccent
-from ietf.utils.mail import send_mail
+from ietf.utils.mail import send_mail, send_mail_text
 from ietf.ietfauth.decorators import role_required
 from ietf.utils import fields as custom_fields
 from ietf.group.models import Group, Role
@@ -25,7 +25,8 @@
 from ietf.nomcom.utils import QUESTIONNAIRE_TEMPLATE, NOMINATION_EMAIL_TEMPLATE, \
                               INEXISTENT_PERSON_TEMPLATE, NOMINEE_EMAIL_TEMPLATE, \
                               NOMINATION_RECEIPT_TEMPLATE, FEEDBACK_RECEIPT_TEMPLATE, \
-                              get_user_email, get_hash_nominee_position, get_year_by_nomcom
+                              get_user_email, get_hash_nominee_position, get_year_by_nomcom, \
+                              HEADER_QUESTIONNAIRE_TEMPLATE 
 from ietf.nomcom.decorators import member_required
 
 ROLODEX_URL = getattr(settings, 'ROLODEX_URL', None)
@@ -426,9 +427,13 @@ def save(self, commit=True):
                 to_email = email.address
                 context = {'nominee': email.person.name,
                           'position': position.name}
+                path = '%s%d/%s' % (nomcom_template_path,
+                                    position.id, HEADER_QUESTIONNAIRE_TEMPLATE)
+                body = render_to_string(path, context)
                 path = '%s%d/%s' % (nomcom_template_path,
                                     position.id, QUESTIONNAIRE_TEMPLATE)
-                send_mail(None, to_email, from_email, subject, path, context)
+                body += '\n\n%s' % render_to_string(path, context)
+                send_mail_text(None, to_email, from_email, subject, body)
 
         # send emails to nomcom chair
         subject = 'Nomination Information'