altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
- Legacy-Id: 5599
This commit is contained in:
Emilio A. Sánchez López 2013-03-27 08:04:10 +00:00
parent 85ab39f1ab
commit f81dd9a1ed
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/nomcom/decorators.py
View file

@ -12,8 +12,6 @@ def member_required(role=None):
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:

11
ietf/nomcom/forms.py
View file

@ -14,7 +14,7 @@ from django.contrib.sites.models import Site
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.models import NomCom, Nomination, Nominee, NomineePosition, \
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 @@ class NominateForm(BaseNomcomForm, forms.ModelForm):
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'