Bulk actions
diff --git a/vendor/registrasion/registrasion/views.py b/vendor/registrasion/registrasion/views.py
index b4ecd70589e7c4daae016ac50dc6e3077c4a89d0..0e6e442ec722bde222e0d25b7c12531450a2f695 100644
--- a/vendor/registrasion/registrasion/views.py
+++ b/vendor/registrasion/registrasion/views.py
@@ -348,7 +348,7 @@ def _guided_registration_profile_and_voucher(request):
title="Profile and Personal Information",
form=profile_form,
description=("
You can come back and edit these details any time before "
- "January 1 2022.
"),
+ "March 10 2023.
"),
)
return [voucher_section, profile_section]
diff --git a/vendor/symposion/schedule/views.py b/vendor/symposion/schedule/views.py
index e5fe6bd7e13476f3a3de336a719987d055b5b2d7..41a86ffb101a082890a83ce7845bdf4ede814503 100644
--- a/vendor/symposion/schedule/views.py
+++ b/vendor/symposion/schedule/views.py
@@ -221,6 +221,7 @@ def make_speaker_dict(speaker, can_view_contact_details):
return {
'name': speaker.name,
'twitter': speaker.twitter_username,
+ 'mastodon': speaker.mastodon_username,
'contact': speaker.email if can_view_contact_details else 'redacted',
'picture_url': speaker_photo(None, speaker, 120),
'code': speaker.code,
@@ -286,6 +287,8 @@ def schedule_json(request):
})
if not slot.content.speaker.twitter_username == '':
slot_data["twitter_id"] = slot.content.speaker.twitter_username
+ if not slot.content.speaker.mastodon_username == '':
+ slot_data["mastodon_id"] = slot.content.speaker.mastodon_username
else:
slot_data.update({
"name": slot.content_override if slot.content_override else "Slot",
@@ -300,7 +303,7 @@ def schedule_json(request):
class EventFeed(ICalFeed):
- product_id = '-//linux.conf.au/schedule//EN'
+ product_id = '-//2023.everythingopen.au/schedule//EN'
timezone = settings.TIME_ZONE
filename = 'conference.ics'
diff --git a/vendor/symposion/speakers/forms.py b/vendor/symposion/speakers/forms.py
index d2c75d2548e8f05b9e3a0f9cf5c85ab1cb9a4638..46466a8782b7c81fd6cd4eae1d96340f1069e75b 100644
--- a/vendor/symposion/speakers/forms.py
+++ b/vendor/symposion/speakers/forms.py
@@ -11,17 +11,19 @@ class SpeakerForm(forms.ModelForm):
model = Speaker
fields = [
"name",
+ "pronouns",
"biography",
"experience",
"photo",
- #"telephone",
+ "telephone",
"local_timezone",
"homepage",
"twitter_username",
+ "mastodon_username",
"accessibility",
- #"travel_assistance",
- #"accommodation_assistance",
- #"assistance",
+ "travel_assistance",
+ "accommodation_assistance",
+ "assistance",
"agreement",
]
diff --git a/vendor/symposion/speakers/migrations/0011_auto_20221208_0102.py b/vendor/symposion/speakers/migrations/0011_auto_20221208_0102.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab6e6c821b482aae101003b10a81f0db03a1db55
--- /dev/null
+++ b/vendor/symposion/speakers/migrations/0011_auto_20221208_0102.py
@@ -0,0 +1,33 @@
+# Generated by Django 2.2.28 on 2022-12-07 14:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('symposion_speakers', '0010_speaker_local_timezone'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='speaker',
+ name='mastodon_username',
+ field=models.CharField(blank=True, help_text='Your Mastodon account', max_length=100),
+ ),
+ migrations.AddField(
+ model_name='speaker',
+ name='pronouns',
+ field=models.CharField(blank=True, max_length=20, verbose_name='Pronouns'),
+ ),
+ migrations.AlterField(
+ model_name='speaker',
+ name='assistance',
+ field=models.TextField(blank=True, help_text='We have budget set aside to provide financial assistance to speakers and attendees who might otherwise find it difficult to attend. Please provide details on why you require travel and/or accommodation assistance in order to present your proposed sessions. For travel assistance, please also tell us where you will be coming from (country, state, etc) to assist with planning.', verbose_name='Travel/Accommodation assistance details'),
+ ),
+ migrations.AlterField(
+ model_name='speaker',
+ name='travel_assistance',
+ field=models.BooleanField(blank=True, default=False, help_text='Check this box if you require assistance to travel to the conference in order to present your proposed sessions.', verbose_name='Travel assistance required'),
+ ),
+ ]
diff --git a/vendor/symposion/speakers/models.py b/vendor/symposion/speakers/models.py
index 5f2a86a679da49de6a4b154dd1164de487ad3e02..2f9aec2b1232a8eff0b521cfed8ce31d54448958 100644
--- a/vendor/symposion/speakers/models.py
+++ b/vendor/symposion/speakers/models.py
@@ -26,6 +26,10 @@ class Speaker(models.Model):
name = models.CharField(verbose_name=_("Name"), max_length=100,
help_text=_("As you would like it to appear in the"
" conference programme."))
+ pronouns = models.CharField(verbose_name=_("Pronouns"),
+ max_length=20,
+ blank=True,
+ )
biography = models.TextField(
blank=True,
help_text=_("This will appear on the conference website and in the "
@@ -68,6 +72,11 @@ class Speaker(models.Model):
blank=True,
help_text=_(u"Your Twitter account")
)
+ mastodon_username = models.CharField(
+ max_length=100,
+ blank=True,
+ help_text=_(u"Your Mastodon account")
+ )
accessibility = models.TextField(
blank=True,
help_text=_("Let us know how we can help you during the conference, for example "
@@ -78,7 +87,7 @@ class Speaker(models.Model):
travel_assistance = models.BooleanField(
blank=True,
default=False,
- help_text=_("Check this box if you require assistance to travel to linux.conf.au "
+ help_text=_("Check this box if you require assistance to travel to the conference "
"in order to present your proposed sessions."),
verbose_name=_("Travel assistance required"),
)
@@ -92,7 +101,7 @@ class Speaker(models.Model):
assistance = models.TextField(
blank=True,
help_text=_("We have budget set aside to provide financial assistance to "
- "linux.conf.au speakers and attendees who might otherwise find it difficult to attend. "
+ "speakers and attendees who might otherwise find it difficult to attend. "
"Please provide details on why you require travel and/or accommodation assistance "
"in order to present your proposed sessions. "
"For travel assistance, please also tell us where you will be coming from "