Update Miniconf Proposals
Add extra questions to SysAdmin Miniconf. Update wording for ticket acknowledgement.
This commit is contained in:
parent
2a720bd46b
commit
5c787ba373
4 changed files with 86 additions and 2 deletions
|
@ -126,9 +126,13 @@ class OpenHardwareProposalForm(MiniconfSessionProposalForm):
|
||||||
fields = HARDWARE_FIELDS
|
fields = HARDWARE_FIELDS
|
||||||
|
|
||||||
|
|
||||||
|
SYSADMIN_FIELDS = copy.copy(TALK_FORMAT_FIELDS)
|
||||||
|
SYSADMIN_FIELDS.insert(3, "local_timezone")
|
||||||
|
SYSADMIN_FIELDS.insert(4, "tech_check")
|
||||||
|
|
||||||
class SysAdminProposalForm(MiniconfSessionProposalForm):
|
class SysAdminProposalForm(MiniconfSessionProposalForm):
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = models.SysAdminProposal
|
model = models.SysAdminProposal
|
||||||
fields = TALK_FORMAT_FIELDS
|
fields = SYSADMIN_FIELDS
|
||||||
|
|
||||||
|
|
43
pinaxcon/proposals/migrations/0018_lca2021_miniconfs_2.py
Normal file
43
pinaxcon/proposals/migrations/0018_lca2021_miniconfs_2.py
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
# Generated by Django 2.2.17 on 2020-11-23 13:41
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('proposals', '0017_lca2021_miniconfs'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='sysadminproposal',
|
||||||
|
name='local_timezone',
|
||||||
|
field=models.CharField(default='', help_text='What is your local timezone that you will be presenting from?', max_length=100),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='sysadminproposal',
|
||||||
|
name='tech_check',
|
||||||
|
field=models.BooleanField(default=False, help_text="Will you be available for an 'AV Tech Check' on 5 January 2021?", verbose_name='AV Tech Check'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='glamproposal',
|
||||||
|
name='ticket_acknowledgement',
|
||||||
|
field=models.BooleanField(default=False, help_text='I understand that I may be required to purchase a conference ticket as linux.conf.au miniconfs are unfunded community run events.'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='kernelproposal',
|
||||||
|
name='ticket_acknowledgement',
|
||||||
|
field=models.BooleanField(default=False, help_text='I understand that I may be required to purchase a conference ticket as linux.conf.au miniconfs are unfunded community run events.'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='openhardwareproposal',
|
||||||
|
name='ticket_acknowledgement',
|
||||||
|
field=models.BooleanField(default=False, help_text='I understand that I may be required to purchase a conference ticket as linux.conf.au miniconfs are unfunded community run events.'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='sysadminproposal',
|
||||||
|
name='ticket_acknowledgement',
|
||||||
|
field=models.BooleanField(default=False, help_text='I understand that I may be required to purchase a conference ticket as linux.conf.au miniconfs are unfunded community run events.'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -79,7 +79,7 @@ class MiniconfSessionProposal(Proposal):
|
||||||
|
|
||||||
ticket_acknowledgement = models.BooleanField(
|
ticket_acknowledgement = models.BooleanField(
|
||||||
default=False,
|
default=False,
|
||||||
help_text="I understand that I will be required to purchase a conference ticket "
|
help_text="I understand that I may be required to purchase a conference ticket "
|
||||||
"as linux.conf.au miniconfs are unfunded community run events."
|
"as linux.conf.au miniconfs are unfunded community run events."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -177,5 +177,22 @@ class SysAdminProposal(MiniconfSessionProposal):
|
||||||
help_text="Talks at the System Administration Miniconf will be short presentations."
|
help_text="Talks at the System Administration Miniconf will be short presentations."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
local_timezone = models.CharField(
|
||||||
|
max_length=100,
|
||||||
|
blank=False,
|
||||||
|
default="",
|
||||||
|
help_text="What is your local timezone that you will be presenting from?"
|
||||||
|
)
|
||||||
|
|
||||||
|
tech_check = models.BooleanField(
|
||||||
|
"AV Tech Check",
|
||||||
|
default=False,
|
||||||
|
help_text="Will you be available for an 'AV Tech Check' on 5 January 2021?"
|
||||||
|
)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_sysadmin_miniconf(self):
|
||||||
|
return True
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = "System Administration Miniconf Proposal"
|
verbose_name = "System Administration Miniconf Proposal"
|
||||||
|
|
|
@ -66,6 +66,26 @@
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if proposal.is_sysadmin_miniconf %}
|
||||||
|
<div class="row">
|
||||||
|
<label class="list-label col-md-2">AV Tech Check on 5 Jan 2021</label>
|
||||||
|
<div class="col-md-10">
|
||||||
|
<p>{{ proposal.tech_check }} </p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<label class="list-label col-md-2">Local Timezone</label>
|
||||||
|
<div class="col-md-10">
|
||||||
|
{% if proposal.local_timezone %}
|
||||||
|
<p>{{ proposal.local_timezone|safe }} </p>
|
||||||
|
{% else %}
|
||||||
|
<p><b>None Provided</b></p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if proposal.additional_speakers.all %}
|
{% if proposal.additional_speakers.all %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<label class="list-label col-md-2">Additional Speakers</label>
|
<label class="list-label col-md-2">Additional Speakers</label>
|
||||||
|
|
Loading…
Reference in a new issue