Add proposal type for docs miniconf
This commit is contained in:
parent
bc29fd49bf
commit
dd30906971
5 changed files with 57 additions and 2 deletions
|
@ -24,7 +24,8 @@ for model in [ models.TalkProposal, models.TutorialProposal,
|
||||||
models.MiniconfProposal, models.SysAdminProposal,
|
models.MiniconfProposal, models.SysAdminProposal,
|
||||||
models.KernelProposal, models.GamesProposal,
|
models.KernelProposal, models.GamesProposal,
|
||||||
models.OpenHardwareProposal, models.OpenEdProposal,
|
models.OpenHardwareProposal, models.OpenEdProposal,
|
||||||
models.DevDevProposal, models.ArtTechProposal ]:
|
models.DevDevProposal, models.ArtTechProposal,
|
||||||
|
models.DocsProposal ]:
|
||||||
admin.site.register(model, CategoryAdmin,
|
admin.site.register(model, CategoryAdmin,
|
||||||
list_display = [
|
list_display = [
|
||||||
"id",
|
"id",
|
||||||
|
|
|
@ -5,7 +5,7 @@ from django import forms
|
||||||
from pinaxcon.proposals.models import TalkProposal, TutorialProposal, MiniconfProposal
|
from pinaxcon.proposals.models import TalkProposal, TutorialProposal, MiniconfProposal
|
||||||
from pinaxcon.proposals.models import SysAdminProposal, KernelProposal, OpenHardwareProposal
|
from pinaxcon.proposals.models import SysAdminProposal, KernelProposal, OpenHardwareProposal
|
||||||
from pinaxcon.proposals.models import GamesProposal, DevDevProposal, ArtTechProposal
|
from pinaxcon.proposals.models import GamesProposal, DevDevProposal, ArtTechProposal
|
||||||
from pinaxcon.proposals.models import OpenEdProposal
|
from pinaxcon.proposals.models import OpenEdProposal, DocsProposal
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_FIELDS = [
|
DEFAULT_FIELDS = [
|
||||||
|
@ -36,6 +36,13 @@ class ProposalForm(forms.ModelForm):
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
class DocsProposalForm(ProposalForm):
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = DocsProposal
|
||||||
|
fields = TALK_FORMAT_FIELDS
|
||||||
|
|
||||||
|
|
||||||
class TalkProposalForm(ProposalForm):
|
class TalkProposalForm(ProposalForm):
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
31
pinaxcon/proposals/migrations/0009_docsproposal.py
Normal file
31
pinaxcon/proposals/migrations/0009_docsproposal.py
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.15 on 2018-10-03 08:19
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('symposion_proposals', '0003_auto_20170702_2250'),
|
||||||
|
('proposals', '0008_auto_20180929_1555'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='DocsProposal',
|
||||||
|
fields=[
|
||||||
|
('proposalbase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='symposion_proposals.ProposalBase')),
|
||||||
|
('target_audience', models.IntegerField(choices=[(1, 'User'), (2, 'Business'), (3, 'Community'), (4, 'Developer')])),
|
||||||
|
('recording_release', models.BooleanField(default=True, help_text="I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>")),
|
||||||
|
('materials_release', models.BooleanField(default=True, help_text="I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>")),
|
||||||
|
('talk_format', models.IntegerField(choices=[(1, 'Presentation (40-45 min)'), (2, 'Short Presentation (20-30 min)'), (3, 'Lightning Talk (5-10 min)')], help_text='Please indicate your preferred talk length in the private abstract field below.')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'Docs Down Under Miniconf Proposal',
|
||||||
|
},
|
||||||
|
bases=('symposion_proposals.proposalbase',),
|
||||||
|
),
|
||||||
|
]
|
|
@ -61,6 +61,21 @@ class MiniconfProposal(Proposal):
|
||||||
verbose_name = "miniconf proposal"
|
verbose_name = "miniconf proposal"
|
||||||
|
|
||||||
|
|
||||||
|
class DocsProposal(Proposal):
|
||||||
|
TALK_FORMATS = [
|
||||||
|
(1, "Presentation (40-45 min)"),
|
||||||
|
(2, "Short Presentation (20-30 min)"),
|
||||||
|
(3, "Lightning Talk (5-10 min)")
|
||||||
|
]
|
||||||
|
|
||||||
|
talk_format = models.IntegerField(
|
||||||
|
choices=TALK_FORMATS,
|
||||||
|
help_text="Please indicate your preferred talk length in the private abstract field below.")
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = "Docs Down Under Miniconf Proposal"
|
||||||
|
|
||||||
|
|
||||||
class SysAdminProposal(Proposal):
|
class SysAdminProposal(Proposal):
|
||||||
|
|
||||||
TYPE_SHORT_PRESENTATION = 1
|
TYPE_SHORT_PRESENTATION = 1
|
||||||
|
|
|
@ -343,6 +343,7 @@ PROPOSAL_FORMS = {
|
||||||
"opened-miniconf": "pinaxcon.proposals.forms.OpenEdProposalForm",
|
"opened-miniconf": "pinaxcon.proposals.forms.OpenEdProposalForm",
|
||||||
"devdev-miniconf": "pinaxcon.proposals.forms.DevDevProposalForm",
|
"devdev-miniconf": "pinaxcon.proposals.forms.DevDevProposalForm",
|
||||||
"arttech-miniconf": "pinaxcon.proposals.forms.ArtTechProposalForm",
|
"arttech-miniconf": "pinaxcon.proposals.forms.ArtTechProposalForm",
|
||||||
|
"docs-miniconf": "pinaxcon.proposals.forms.DocsProposalForm",
|
||||||
}
|
}
|
||||||
|
|
||||||
# Registrasion bits:
|
# Registrasion bits:
|
||||||
|
|
Loading…
Reference in a new issue