Add checkbox to send receipt to nominator.
See #913 #929 - Legacy-Id: 5547
This commit is contained in:
Emilio Jiménez
parent
50dd5ba30b
commit
7cd0f0b49a
|
|
@ -91,7 +91,7 @@ $position: Position</field>
|
|||
</field>
|
||||
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
|
||||
</object>
|
||||
<object pk="8" model="dbtemplate.dbtemplate">
|
||||
<object p="8" model="dbtemplate.dbtemplate">
|
||||
<field type="CharField" name="path">/nomcom/defaults/email/nomination_reminder.txt</field>
|
||||
<field type="CharField" name="title">Email sent to nominees asking them to accept (or decline) the nominations.</field>
|
||||
<field type="TextField" name="variables">$positions: Nomination positions</field>
|
||||
|
|
@ -107,4 +107,25 @@ If you accept, you will need to fill out a questionnaire. You will receive the
|
|||
Best regards,</field>
|
||||
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
|
||||
</object>
|
||||
<object p="9" model="dbtemplate.dbtemplate">
|
||||
<field type="CharField" name="path">/nomcom/defaults/email/nomination_receipt.txt</field>
|
||||
<field type="CharField" name="title">Email sent to nominator to get a confirmation mail containing feedback in cleartext</field>
|
||||
<field type="TextField" name="variables">$nominee: Full name of the nominee
|
||||
$position: Nomination position
|
||||
$comments: Candidate's Qualifications for the Position</field>
|
||||
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
|
||||
<field type="TextField" name="content">Hi,
|
||||
|
||||
Your nomination of $nominee for the position of
|
||||
$position has been received and registered.
|
||||
|
||||
The following comments have also been registered:
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
$comments
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Thank you,</field>
|
||||
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
|
||||
</object>
|
||||
</django-objects>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ from ietf.nomcom.models import NomCom, Nomination, Nominee, NomineePosition, \
|
|||
Position, Feedback
|
||||
from ietf.nomcom.utils import QUESTIONNAIRE_TEMPLATE, NOMINATION_EMAIL_TEMPLATE, \
|
||||
INEXISTENT_PERSON_TEMPLATE, NOMINEE_EMAIL_TEMPLATE, \
|
||||
get_user_email
|
||||
NOMINATION_RECEIPT_TEMPLATE, get_user_email
|
||||
from ietf.nomcom.decorators import member_required
|
||||
|
||||
ROLODEX_URL = getattr(settings, 'ROLODEX_URL', None)
|
||||
|
|
@ -284,10 +284,15 @@ class MergeForm(BaseNomcomForm, forms.Form):
|
|||
|
||||
|
||||
class NominateForm(BaseNomcomForm, forms.ModelForm):
|
||||
comments = forms.CharField(label='Comments', widget=forms.Textarea())
|
||||
comments = forms.CharField(label="Candidate's Qualifications for the Position:",
|
||||
widget=forms.Textarea())
|
||||
confirmation = forms.BooleanField(label='Email comments back to me as confirmation',
|
||||
help_text="If you want to get a confirmation mail containing your feedback in cleartext, \
|
||||
please check the 'email comments back to me as confirmation' box below.",
|
||||
required=False)
|
||||
|
||||
fieldsets = [('Candidate Nomination', ('position', 'candidate_name',
|
||||
'candidate_email', 'candidate_phone', 'comments'))]
|
||||
'candidate_email', 'candidate_phone', 'comments', 'confirmation'))]
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.nomcom = kwargs.pop('nomcom', None)
|
||||
|
|
@ -301,8 +306,13 @@ class NominateForm(BaseNomcomForm, forms.ModelForm):
|
|||
author = get_user_email(self.user)
|
||||
if author:
|
||||
self.fields['nominator_email'].initial = author.address
|
||||
self.fieldsets = [('Candidate Nomination', ('position',
|
||||
'nominator_email', 'candidate_name',
|
||||
help_text = """(Nomcom Chair/Member: please fill this in. Use your own email address if the person making the
|
||||
nomination wishes to be anonymous. The confirmation email will be sent to the address given here,
|
||||
and the address will also be captured as part of the registered nomination.)"""
|
||||
self.fields['nominator_email'].help_text = help_text
|
||||
self.fieldsets = [('Candidate Nomination', ('nominator_email',
|
||||
'position',
|
||||
'candidate_name',
|
||||
'candidate_email', 'candidate_phone',
|
||||
'comments'))]
|
||||
|
||||
|
|
@ -314,6 +324,7 @@ class NominateForm(BaseNomcomForm, forms.ModelForm):
|
|||
candidate_name = self.cleaned_data['candidate_name']
|
||||
position = self.cleaned_data['position']
|
||||
comments = self.cleaned_data['comments']
|
||||
confirmation = self.cleaned_data['confirmation']
|
||||
nomcom_template_path = '/nomcom/%s/' % self.nomcom.group.acronym
|
||||
nomcom_chair = self.nomcom.group.get_chair()
|
||||
nomcom_chair_mail = nomcom_chair and nomcom_chair.email.address or None
|
||||
|
|
@ -373,7 +384,7 @@ class NominateForm(BaseNomcomForm, forms.ModelForm):
|
|||
from_email = settings.NOMCOM_FROM_EMAIL
|
||||
to_email = email.address
|
||||
context = {'nominee': email.person.name,
|
||||
'position': position}
|
||||
'position': position.name}
|
||||
path = nomcom_template_path + NOMINEE_EMAIL_TEMPLATE
|
||||
send_mail(None, to_email, from_email, subject, path, context)
|
||||
|
||||
|
|
@ -384,7 +395,7 @@ class NominateForm(BaseNomcomForm, forms.ModelForm):
|
|||
from_email = settings.NOMCOM_FROM_EMAIL
|
||||
to_email = email.address
|
||||
context = {'nominee': email.person.name,
|
||||
'position': position}
|
||||
'position': position.name}
|
||||
path = '%s%d/%s' % (nomcom_template_path,
|
||||
position.id, QUESTIONNAIRE_TEMPLATE)
|
||||
send_mail(None, to_email, from_email, subject, path, context)
|
||||
|
|
@ -395,13 +406,24 @@ class NominateForm(BaseNomcomForm, forms.ModelForm):
|
|||
to_email = nomcom_chair_mail
|
||||
context = {'nominee': email.person.name,
|
||||
'nominee_email': email.address,
|
||||
'position': position}
|
||||
'position': position.name}
|
||||
if author:
|
||||
context.update({'nominator': author.person.name,
|
||||
'nominator_email': author.address})
|
||||
path = nomcom_template_path + NOMINATION_EMAIL_TEMPLATE
|
||||
send_mail(None, to_email, from_email, subject, path, context)
|
||||
|
||||
if confirmation or not self.public:
|
||||
if author:
|
||||
subject = 'Nomination Receipt'
|
||||
from_email = settings.NOMCOM_FROM_EMAIL
|
||||
to_email = author.address
|
||||
context = {'nominee': email.person.name,
|
||||
'comments': comments,
|
||||
'position': position.name}
|
||||
path = nomcom_template_path + NOMINATION_RECEIPT_TEMPLATE
|
||||
send_mail(None, to_email, from_email, subject, path, context)
|
||||
|
||||
return nomination
|
||||
|
||||
class Meta:
|
||||
|
|
|
|||
|
|
@ -15,11 +15,13 @@ INEXISTENT_PERSON_TEMPLATE = 'email/inexistent_person.txt'
|
|||
NOMINEE_EMAIL_TEMPLATE = 'email/new_nominee.txt'
|
||||
NOMINATION_EMAIL_TEMPLATE = 'email/new_nomination.txt'
|
||||
NOMINEE_REMINDER_TEMPLATE = 'email/nomination_reminder.txt'
|
||||
NOMINATION_RECEIPT_TEMPLATE = 'email/nomination_receipt.txt'
|
||||
DEFAULT_NOMCOM_TEMPLATES = [HOME_TEMPLATE,
|
||||
INEXISTENT_PERSON_TEMPLATE,
|
||||
NOMINEE_EMAIL_TEMPLATE,
|
||||
NOMINATION_EMAIL_TEMPLATE,
|
||||
NOMINEE_REMINDER_TEMPLATE]
|
||||
NOMINEE_REMINDER_TEMPLATE,
|
||||
NOMINATION_RECEIPT_TEMPLATE]
|
||||
|
||||
|
||||
def get_nomcom_by_year(year):
|
||||
|
|
|
|||
Loading…
Reference in a new issue