From 111e5241c7d5de8bceca08ae6667302a847d2dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Sun, 14 Oct 2018 21:09:58 +0200 Subject: [PATCH] add acceptances disclosure date field in conference form --- cfp/environment.py | 10 +++++++--- cfp/forms.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cfp/environment.py b/cfp/environment.py index 80cee5e..b71dcab 100644 --- a/cfp/environment.py +++ b/cfp/environment.py @@ -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): diff --git a/cfp/forms.py b/cfp/forms.py index c5127e1..baef338 100644 --- a/cfp/forms.py +++ b/cfp/forms.py @@ -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 = {