symposion_app Changeset - 5c787ba3730d

Changeset - 5c787ba3730d

Parent rev.

Child rev.

[Not reviewed]

0 3 1

Joel Addison - 3 years ago 2020-11-23 13:50:54
joel@addison.net.au

Update Miniconf Proposals

Add extra questions to SysAdmin Miniconf. Update wording for ticket acknowledgement.

4 files changed with 86 insertions and 2 deletions:

pinaxcon/proposals/forms.py

pinaxcon/proposals/migrations/0018_lca2021_miniconfs_2.py

pinaxcon/proposals/models.py

pinaxcon/templates/symposion/proposals/_proposal_fields.html

0 comments (0 inline, 0 general)

pinaxcon/proposals/forms.py

➞

Show inline comments

@@ ... @@
         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 Meta:
         model = models.SysAdminProposal
-        fields = TALK_FORMAT_FIELDS
+        fields = SYSADMIN_FIELDS

pinaxcon/proposals/migrations/0018_lca2021_miniconfs_2.py

➞

Show inline comments

 new file 100644
 # 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.'),
         ),
+    ]

pinaxcon/proposals/models.py

➞

Show inline comments

@@ ... / @@ -79,7 +79,7 @@ class MiniconfSessionProposal(Proposal): @@
     ticket_acknowledgement = models.BooleanField(
         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."
+    )
@@ ... / @@ -177,5 +177,22 @@ class SysAdminProposal(MiniconfSessionProposal): @@
         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:
         verbose_name = "System Administration Miniconf Proposal"

pinaxcon/templates/symposion/proposals/_proposal_fields.html

➞

Show inline comments

@@ ... / @@ -66,6 +66,26 @@ @@
 </div>
 {% 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 }}&nbsp;</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 }}&nbsp;</p>
     {% else %}
     <p><b>None Provided</b></p>
     {% endif %}
   </div>
 </div>
 {% endif %}
 {% if proposal.additional_speakers.all %}
 <div class="row">
   <label class="list-label col-md-2">Additional Speakers</label>

0 comments (0 inline, 0 general)