Add a checkbox to the Talk submission page (#1368)

* initial

* renamed to something more sensible

* Add a required checkbox to the CfP proposal submission page. The checkbox content is not stored in the database, but submission will fail unless checked.

* added test to verify that speakers do have to agree to the speaker release agreement

Author: fpierfed

conference/forms/forms.py

@@ -14,6 +14,14 @@
 from p3 import utils as p3utils
 from conference import models
 
+
+REL_AGR_URL = 'https://epstage.europython.eu/events/speaker-release-agreement/'
+RELEASE_AGREEMENT_CHECKBOX = (
+    "I agree with the terms outlined in the " +
+    f"<a href='{REL_AGR_URL}' target='_blank'>" +
+    "EuroPython Speaker Release Agreement</a>"
+)
+
 log = logging.getLogger('conference.tags')
 
 ### Helpers
@@ -149,6 +157,10 @@ class TalkBaseForm(forms.Form):
         help_text=_('<p>Please add anything you may find useful for the review of your session proposal, e.g. references of where you have held talks, blogs, YouTube channels, books you have written, etc. This information will only be shown for talk review purposes.</p>'),
         widget=forms.Textarea,
         required=False)
+    i_accept_speaker_release = forms.BooleanField(
+        label=RELEASE_AGREEMENT_CHECKBOX,
+        required=True
+    )
 
 
 class TrackForm(forms.ModelForm):

conference/forms/talks.py

@@ -5,7 +5,7 @@
 from taggit_labels.widgets import LabelWidget
 
 from conference.forms import TalkBaseForm
-from conference.models import (Conference, ConferenceTag, Talk, TALK_TYPE, 
+from conference.models import (Conference, ConferenceTag, Talk, TALK_TYPE,
     CFP_TALK_TYPE)
 
 
@@ -20,6 +20,9 @@ class TalkUpdateForm(forms.ModelForm):
     prerequisites = TalkBaseForm.base_fields["prerequisites"]
     level = TalkBaseForm.base_fields["level"]
     domain_level = TalkBaseForm.base_fields["domain_level"]
+    i_accept_speaker_release  = TalkBaseForm.base_fields[
+        'i_accept_speaker_release'
+    ]
 
     class Meta:
         model = Talk

tests/test_cfp.py

@@ -152,6 +152,7 @@ def test_if_user_can_submit_talk_details_and_is_redirect_to_step2(user_client):
             "tags": "abc, defg",
             "level": TALK_LEVEL.beginner,
             "domain_level": TALK_LEVEL.advanced,
+            "i_accept_speaker_release": True,
         },
     )
 
@@ -174,6 +175,36 @@ def test_if_user_can_submit_talk_details_and_is_redirect_to_step2(user_client):
     )
 
 
+def test_if_user_cannot_submit_talk_if_release_not_selected(user_client):
+    STEP1_VALIDATION_FAIL_200 = 200
+
+    Conference.objects.create(
+        code=settings.CONFERENCE_CONFERENCE,
+        name=settings.CONFERENCE_CONFERENCE,
+        cfp_start=timezone.now().date() - timedelta(days=2),
+        cfp_end=timezone.now().date() + timedelta(days=1),
+    )
+    step1_url = reverse("cfp:step1_submit_proposal")
+
+    response = user_client.post(
+        step1_url,
+        {
+            "type": TALK_TYPE_CHOICES.t_30,
+            "abstract": "Abstract goes here",
+            "title": "A title",
+            "sub_title": "A sub title",
+            "abstract_short": "Short abstract",
+            "abstract_extra": "Abstract _extra",
+            "tags": "abc, defg",
+            "level": TALK_LEVEL.beginner,
+            "domain_level": TALK_LEVEL.advanced,
+            "i_accept_speaker_release": False,
+        },
+    )
+
+    assert response.status_code == STEP1_VALIDATION_FAIL_200
+
+
 def test_validation_errors_are_handled_on_step2(user_client):
     """
     NOTE(artcz)
@@ -450,6 +481,7 @@ def test_update_proposal_updates_proposal(user_client):
             "title": "New title",
             "sub_title": "New sub title",
             "tags": "Some, tags",
+            "i_accept_speaker_release": True,
         },
     )
 
@@ -470,6 +502,42 @@ def test_update_proposal_updates_proposal(user_client):
     assert talk_dict["speakers"] == []
 
 
+def test_update_proposal_fails_if_missing_release_agreement(user_client):
+    create_conference_with_open_cfp()
+    talk = TalkFactory()
+    talk.setAbstract("some abstract")
+    talk.created_by = user_client.user
+    talk.save()
+
+    edit_url = reverse("cfp:update", args=[talk.uuid])
+
+    response = user_client.post(
+        edit_url,
+        {
+            "type": TALK_TYPE_CHOICES.t_45,
+            "abstract": "New abstract",
+            "abstract_short": "New short abstract",
+            "abstract_extra": "New extra abstract",
+            "level": TALK_LEVEL.intermediate,
+            "domain_level": TALK_LEVEL.advanced,
+            "title": "New title",
+            "sub_title": "New sub title",
+            "tags": "Some, tags",
+            "i_accept_speaker_release": False
+        },
+    )
+
+    # We do not advance and talk should be unchanged in DB
+    assert response.status_code == 200
+
+    # Make sure that nothing changed.
+    orig_talk_dict = dump_relevant_talk_information_to_dict(talk)
+    talk.refresh_from_db()
+    new_talk_dict = dump_relevant_talk_information_to_dict(talk)
+
+    assert orig_talk_dict == new_talk_dict
+
+
 def test_update_speaker_updated_speaker(user_client):
     create_conference_with_open_cfp()
     talk = TalkFactory()

tests/test_talks.py

@@ -6,6 +6,7 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.utils import timezone
 
+from conference.cfp import dump_relevant_talk_information_to_dict
 from conference.models import TALK_STATUS, TALK_LEVEL
 from tests.factories import (
     EventFactory,
@@ -133,6 +134,7 @@ def test_update_talk_post(user_client):
         "level": TALK_LEVEL.advanced,
         "domain_level": TALK_LEVEL.advanced,
         "tags": ",".join(tag.name for tag in tags),
+        "i_accept_speaker_release": True,
     }
     resp = user_client.post(url, data=post_data)
 
@@ -150,6 +152,37 @@ def test_update_talk_post(user_client):
     )
 
 
+def test_update_talk_post_fails_if_release_not_agreed(user_client):
+    tomorrow = timezone.now().date() + timedelta(days=1)
+    get_default_conference(conference_end=tomorrow)
+    talk = TalkFactory(created_by=user_client.user, status=TALK_STATUS.accepted)
+    url = reverse("talks:update_talk", args=[talk.slug])
+
+    tags = ConferenceTagFactory.create_batch(size=3)
+    post_data = {
+        "title": "new title",
+        "sub_title": "new sub title",
+        "abstract": "new abstract",
+        "abstract_short": "new short abstract",
+        "prerequisites": "new prerequisites",
+        "level": TALK_LEVEL.advanced,
+        "domain_level": TALK_LEVEL.advanced,
+        "tags": ",".join(tag.name for tag in tags),
+        "i_accept_speaker_release": False,
+    }
+    resp = user_client.post(url, data=post_data)
+
+    # We do not advance and talk should be unchanged in DB
+    assert resp.status_code == 200
+
+    # Make sure that nothing changed.
+    orig_talk_dict = dump_relevant_talk_information_to_dict(talk)
+    talk.refresh_from_db()
+    new_talk_dict = dump_relevant_talk_information_to_dict(talk)
+
+    assert orig_talk_dict == new_talk_dict
+
+
 def test_anonymous_cannot_get_submit_slides(client):
     get_default_conference()
     talk = TalkFactory(status=TALK_STATUS.accepted)