diff --git a/src/program/forms.py b/src/program/forms.py index c52a2680..611b80ff 100644 --- a/src/program/forms.py +++ b/src/program/forms.py @@ -185,7 +185,7 @@ class SpeakerProposalForm(forms.ModelForm): # no free tickets for workshops del self.fields["needs_oneday_ticket"] - elif event_type.name == "Recreational": + elif event_type.name == "Recreational Event": # fix label and help_text for the name field self.fields["name"].label = "Host Name" self.fields["name"].help_text = "Can be a real name or an alias." @@ -293,9 +293,8 @@ class EventProposalForm(forms.ModelForm): LIGHTNING_TALK = "Lightning Talk" DEBATE = "Debate" MUSIC_ACT = "Music Act" - RECREATIONAL_EVENT = "Recreational" + RECREATIONAL_EVENT = "Recreational Event" WORKSHOP = "Workshop" - SLACKING_OFF = "Slacking Off" MEETUP = "Meetup" # disable the empty_label for the track select box @@ -430,7 +429,7 @@ class EventProposalForm(forms.ModelForm): # no video recording for workshops del self.fields["allow_video_recording"] - elif event_type.name == SLACKING_OFF: + elif event_type.name == RECREATIONAL_EVENT: # fix label and help_text for the title field self.fields["title"].label = "Event Title" self.fields["title"].help_text = "The title of this recreational event." diff --git a/src/utils/management/commands/bootstrap-devsite.py b/src/utils/management/commands/bootstrap-devsite.py index cd44b80b..e2fa2701 100644 --- a/src/utils/management/commands/bootstrap-devsite.py +++ b/src/utils/management/commands/bootstrap-devsite.py @@ -456,16 +456,16 @@ class Command(BaseCommand): support_speaker_event_conflicts=False, ) - types["slack"] = EventType.objects.create( - name="Recreational", - slug="recreational", + types["recreational"] = EventType.objects.create( + name="Recreational Event", + slug="recreational-event", color="#0000ff", light_text=True, public=True, description="Events of a recreational nature", icon="dice", host_title="Host", - event_duration_minutes="60", + event_duration_minutes="600", support_autoscheduling=False, support_speaker_event_conflicts=True, ) @@ -830,7 +830,7 @@ class Command(BaseCommand): ) EventSession.objects.create( camp=camp, - event_type=event_types["slack"], + event_type=event_types["recreational"], event_location=event_locations["speakers_tent"], when=( tz.localize(datetime(start.year, start.month, start.day, 12, 0)), @@ -950,7 +950,7 @@ class Command(BaseCommand): user=random.choice(User.objects.all()), title="Lunch break", abstract="Daily lunch break. Remember to drink water.", - event_type=event_types["slack"], + event_type=event_types["recreational"], track=random.choice(camp.event_tracks.all()), ).mark_as_approved() @@ -1056,7 +1056,9 @@ class Command(BaseCommand): event_session__event_location=camp.event_locations.get( name="Speakers Tent" ), - event_session__event_type=EventType.objects.get(name="Recreational"), + event_session__event_type=EventType.objects.get( + name="Recreational Event" + ), when=(start, start + timedelta(hours=1)), ) lunchslot.event = lunch