reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

complete the rename of slacking off to recreational event, fixes #603 maybe

Browse source
This commit is contained in:
Thomas Steen Rasmussen 2020-08-03 23:41:51 +02:00
parent 778eb2d90c
commit 71a0f4f594
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/program/forms.py
View file

@ -185,7 +185,7 @@ class SpeakerProposalForm(forms.ModelForm):
# no free tickets for workshops # no free tickets for workshops
del self.fields["needs_oneday_ticket"] 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 # fix label and help_text for the name field
self.fields["name"].label = "Host Name" self.fields["name"].label = "Host Name"
self.fields["name"].help_text = "Can be a real name or an alias." 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" LIGHTNING_TALK = "Lightning Talk"
DEBATE = "Debate" DEBATE = "Debate"
MUSIC_ACT = "Music Act" MUSIC_ACT = "Music Act"
RECREATIONAL_EVENT = "Recreational" RECREATIONAL_EVENT = "Recreational Event"
WORKSHOP = "Workshop" WORKSHOP = "Workshop"
SLACKING_OFF = "Slacking Off"
MEETUP = "Meetup" MEETUP = "Meetup"
# disable the empty_label for the track select box # disable the empty_label for the track select box
@ -430,7 +429,7 @@ class EventProposalForm(forms.ModelForm):
# no video recording for workshops # no video recording for workshops
del self.fields["allow_video_recording"] 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 # fix label and help_text for the title field
self.fields["title"].label = "Event Title" self.fields["title"].label = "Event Title"
self.fields["title"].help_text = "The title of this recreational event." self.fields["title"].help_text = "The title of this recreational event."

16
src/utils/management/commands/bootstrap-devsite.py
View file

@ -456,16 +456,16 @@ class Command(BaseCommand):
support_speaker_event_conflicts=False, support_speaker_event_conflicts=False,
) )
types["slack"] = EventType.objects.create( types["recreational"] = EventType.objects.create(
name="Recreational", name="Recreational Event",
slug="recreational", slug="recreational-event",
color="#0000ff", color="#0000ff",
light_text=True, light_text=True,
public=True, public=True,
description="Events of a recreational nature", description="Events of a recreational nature",
icon="dice", icon="dice",
host_title="Host", host_title="Host",
event_duration_minutes="60", event_duration_minutes="600",
support_autoscheduling=False, support_autoscheduling=False,
support_speaker_event_conflicts=True, support_speaker_event_conflicts=True,
) )
@ -830,7 +830,7 @@ class Command(BaseCommand):
) )
EventSession.objects.create( EventSession.objects.create(
camp=camp, camp=camp,
event_type=event_types["slack"], event_type=event_types["recreational"],
event_location=event_locations["speakers_tent"], event_location=event_locations["speakers_tent"],
when=( when=(
tz.localize(datetime(start.year, start.month, start.day, 12, 0)), tz.localize(datetime(start.year, start.month, start.day, 12, 0)),
@ -950,7 +950,7 @@ class Command(BaseCommand):
user=random.choice(User.objects.all()), user=random.choice(User.objects.all()),
title="Lunch break", title="Lunch break",
abstract="Daily lunch break. Remember to drink water.", 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()), track=random.choice(camp.event_tracks.all()),
).mark_as_approved() ).mark_as_approved()
@ -1056,7 +1056,9 @@ class Command(BaseCommand):
event_session__event_location=camp.event_locations.get( event_session__event_location=camp.event_locations.get(
name="Speakers Tent" 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)), when=(start, start + timedelta(hours=1)),
) )
lunchslot.event = lunch lunchslot.event = lunch