add acceptances disclosure date field in conference form

This commit is contained in:
Élie Bouttier 2018-10-14 21:09:58 +02:00
parent 486e3c37d2
commit 111e5241c7
2 changed files with 8 additions and 4 deletions

View File

@ -8,7 +8,7 @@ import pytz
def talk_to_dict(talk, speaker):
base_url = ('https' if talk.site.conference.secure_domain else 'http') + '://' + talk.site.domain
return {
env = {
'title': talk.title,
'description': talk.description,
'category': str(talk.category),
@ -19,9 +19,13 @@ def talk_to_dict(talk, speaker):
'track': str(talk.track) if talk.track else '',
'video': talk.video,
'speakers': list(map(speaker_to_dict, talk.speakers.all())),
'confirm_link': base_url + reverse('proposal-talk-confirm', kwargs={'speaker_token': speaker.token, 'talk_id': talk.pk}),
'desist_link': base_url + reverse('proposal-talk-desist', kwargs={'speaker_token': speaker.token, 'talk_id': talk.pk}),
}
if talk.site.conference.disclosed_acceptances:
env.update({
'confirm_link': base_url + reverse('proposal-talk-confirm', kwargs={'speaker_token': speaker.token, 'talk_id': talk.pk}),
'desist_link': base_url + reverse('proposal-talk-desist', kwargs={'speaker_token': speaker.token, 'talk_id': talk.pk}),
})
return env
def speaker_to_dict(speaker, include_talks=False):

View File

@ -373,7 +373,7 @@ class ConferenceForm(forms.ModelForm):
class Meta:
model = Conference
fields = [
'name', 'venue', 'city', 'contact_email', 'schedule_publishing_date', 'schedule_redirection_url',
'name', 'venue', 'city', 'contact_email', 'acceptances_disclosure_date', 'schedule_publishing_date', 'schedule_redirection_url',
'volunteers_opening_date', 'volunteers_closing_date', 'video_publishing_date', 'reply_email', 'secure_domain', 'staff',
]
widgets = {