diff --git a/pinaxcon/proposals/admin.py b/pinaxcon/proposals/admin.py index eac78362..b5418e64 100644 --- a/pinaxcon/proposals/admin.py +++ b/pinaxcon/proposals/admin.py @@ -7,17 +7,6 @@ from symposion.proposals import models as symposion_models @admin.register(models.TalkProposal) @admin.register(models.TutorialProposal) @admin.register(models.MiniconfProposal) -@admin.register(models.SysAdminProposal) -@admin.register(models.WriteTheDocsProposal) -@admin.register(models.OpenRadioProposal) -@admin.register(models.SecurityProposal) -@admin.register(models.WootconfProposal) -@admin.register(models.KernelProposal) -@admin.register(models.GamesProposal) -@admin.register(models.TestingProposal) -@admin.register(models.KnowledgeProposal) -@admin.register(models.LawProposal) -@admin.register(models.OpenHardwareProposal) class CategoryAdmin(admin.ModelAdmin): class AdditionalSpeakerInline(admin.TabularInline): diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index c9b70753..13da6756 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -3,10 +3,6 @@ from django import forms from pinaxcon import widgets from .models import TalkProposal, TutorialProposal, MiniconfProposal -from .models import SysAdminProposal, WriteTheDocsProposal, WootconfProposal -from .models import KernelProposal, OpenRadioProposal, SecurityProposal -from .models import GamesProposal, TestingProposal, LawProposal, OpenHardwareProposal -from .models import KnowledgeProposal class ProposalForm(forms.ModelForm): @@ -84,260 +80,3 @@ class MiniconfProposalForm(ProposalForm): "private_abstract": widgets.AceMarkdownEditor(), "technical_requirements": widgets.AceMarkdownEditor(), } - - -class SysAdminProposalForm(ProposalForm): - - class Meta: - model = SysAdminProposal - fields = [ - "title", - "talk_format", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class WriteTheDocsProposalForm(ProposalForm): - - class Meta: - model = WriteTheDocsProposal - fields = [ - "title", - "talk_format", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class RadioProposalForm(ProposalForm): - - class Meta: - model = OpenRadioProposal - fields = [ - "title", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class KernelProposalForm(ProposalForm): - - class Meta: - model = KernelProposal - fields = [ - "title", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class WootconfProposalForm(ProposalForm): - - class Meta: - model = WootconfProposal - fields = [ - "title", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class SecurityProposalForm(ProposalForm): - - class Meta: - model = SecurityProposal - fields = [ - "title", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class GamesProposalForm(ProposalForm): - - class Meta: - model = GamesProposal - fields = [ - "title", - "talk_format", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class TestingProposalForm(ProposalForm): - - class Meta: - model = TestingProposal - fields = [ - "title", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class KnowledgeProposalForm(ProposalForm): - - class Meta: - model = KnowledgeProposal - fields = [ - "title", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class LawProposalForm(ProposalForm): - - class Meta: - model = LawProposal - fields = [ - "title", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } - - -class OpenHardwareProposalForm(ProposalForm): - - class Meta: - model = OpenHardwareProposal - fields = [ - "title", - "talk_format", - "target_audience", - "abstract", - "private_abstract", - "technical_requirements", - "project", - "project_url", - "recording_release", - "materials_release", - ] - - widgets = { - "abstract": widgets.AceMarkdownEditor(), - "private_abstract": widgets.AceMarkdownEditor(), - "technical_requirements": widgets.AceMarkdownEditor(), - } diff --git a/pinaxcon/proposals/migrations/0002_sysadminproposal_writethedocsproposal.py b/pinaxcon/proposals/migrations/0002_sysadminproposal_writethedocsproposal.py deleted file mode 100644 index 8f2fa22e..00000000 --- a/pinaxcon/proposals/migrations/0002_sysadminproposal_writethedocsproposal.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-21 10:36 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('symposion_proposals', '0001_initial'), - ('proposals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='SysAdminProposal', - 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, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])), - ('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('talk_format', models.IntegerField(choices=[(1, b'Long Presentation (45 min)'), (2, b'Short Presentation (20 min)'), (3, b'Lightning Talk (5 min)')])), - ], - options={ - 'verbose_name': 'System Administration Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - migrations.CreateModel( - name='WriteTheDocsProposal', - 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, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])), - ('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('talk_format', models.IntegerField(choices=[(1, b'Long Presentation (40 min)'), (2, b'Short Presentation (20 min)')])), - ], - options={ - 'verbose_name': 'WriteThe Docs Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - ] diff --git a/pinaxcon/proposals/migrations/0003_kernelproposal_openradioproposal_securityproposal_wootconfproposal.py b/pinaxcon/proposals/migrations/0003_kernelproposal_openradioproposal_securityproposal_wootconfproposal.py deleted file mode 100644 index 88c09226..00000000 --- a/pinaxcon/proposals/migrations/0003_kernelproposal_openradioproposal_securityproposal_wootconfproposal.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-21 10:44 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('symposion_proposals', '0001_initial'), - ('proposals', '0002_sysadminproposal_writethedocsproposal'), - ] - - operations = [ - migrations.CreateModel( - name='KernelProposal', - 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')), - ], - options={ - 'verbose_name': 'Kernel Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - migrations.CreateModel( - name='OpenRadioProposal', - 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')), - ], - options={ - 'verbose_name': 'OpenRadio Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - migrations.CreateModel( - name='SecurityProposal', - 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')), - ], - options={ - 'verbose_name': 'Security/Privacy Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - migrations.CreateModel( - name='WootconfProposal', - 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')), - ], - options={ - 'verbose_name': 'WOOTCONF Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - ] diff --git a/pinaxcon/proposals/migrations/0004_auto_20160925_0534.py b/pinaxcon/proposals/migrations/0004_auto_20160925_0534.py deleted file mode 100644 index 6c94ede8..00000000 --- a/pinaxcon/proposals/migrations/0004_auto_20160925_0534.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-25 05:34 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('symposion_proposals', '0001_initial'), - ('proposals', '0003_kernelproposal_openradioproposal_securityproposal_wootconfproposal'), - ] - - operations = [ - migrations.CreateModel( - name='GamesProposal', - 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, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])), - ('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('talk_format', models.IntegerField(choices=[(1, b'Presentation'), (2, b'Demonstration'), (3, b'Other')])), - ], - options={ - 'verbose_name': 'Games and FOSS Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - migrations.AlterField( - model_name='sysadminproposal', - name='talk_format', - field=models.IntegerField(choices=[(1, b'Short Presentation (15-25 min)'), (2, b'Lightning Talk (5-10 min)')], help_text=b'Please indicate your preferred talk length in the private abstract field below.'), - ), - ] diff --git a/pinaxcon/proposals/migrations/0005_auto_20160925_0551.py b/pinaxcon/proposals/migrations/0005_auto_20160925_0551.py deleted file mode 100644 index a652934e..00000000 --- a/pinaxcon/proposals/migrations/0005_auto_20160925_0551.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-25 05:51 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0004_auto_20160925_0534'), - ] - - operations = [ - migrations.AddField( - model_name='openradioproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='openradioproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='openradioproposal', - name='target_audience', - field=models.IntegerField(choices=[(1, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')], default=1), - preserve_default=False, - ), - ] diff --git a/pinaxcon/proposals/migrations/0006_auto_20160925_0551.py b/pinaxcon/proposals/migrations/0006_auto_20160925_0551.py deleted file mode 100644 index dbd02ebb..00000000 --- a/pinaxcon/proposals/migrations/0006_auto_20160925_0551.py +++ /dev/null @@ -1,63 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-25 05:51 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0005_auto_20160925_0551'), - ] - - operations = [ - migrations.AddField( - model_name='kernelproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='kernelproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='kernelproposal', - name='target_audience', - field=models.IntegerField(choices=[(1, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')], default=1), - preserve_default=False, - ), - migrations.AddField( - model_name='securityproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='securityproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='securityproposal', - name='target_audience', - field=models.IntegerField(choices=[(1, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')], default=1), - preserve_default=False, - ), - migrations.AddField( - model_name='wootconfproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='wootconfproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AddField( - model_name='wootconfproposal', - name='target_audience', - field=models.IntegerField(choices=[(1, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')], default=1), - preserve_default=False, - ), - ] diff --git a/pinaxcon/proposals/migrations/0007_knowledgeproposal_lawproposal_testingproposal.py b/pinaxcon/proposals/migrations/0007_knowledgeproposal_lawproposal_testingproposal.py deleted file mode 100644 index 0d5da505..00000000 --- a/pinaxcon/proposals/migrations/0007_knowledgeproposal_lawproposal_testingproposal.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-27 07:58 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('symposion_proposals', '0001_initial'), - ('proposals', '0006_auto_20160925_0551'), - ] - - operations = [ - migrations.CreateModel( - name='KnowledgeProposal', - 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, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])), - ('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ], - options={ - 'verbose_name': 'Open Knowledge Australia Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - migrations.CreateModel( - name='LawProposal', - 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, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])), - ('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ], - options={ - 'verbose_name': 'Open Law and Policy Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - migrations.CreateModel( - name='TestingProposal', - 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, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])), - ('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ], - options={ - 'verbose_name': 'Testing/Automation Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - ] diff --git a/pinaxcon/proposals/migrations/0008_openhardwareproposal.py b/pinaxcon/proposals/migrations/0008_openhardwareproposal.py deleted file mode 100644 index ab72c1c6..00000000 --- a/pinaxcon/proposals/migrations/0008_openhardwareproposal.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-12-23 06:13 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('symposion_proposals', '0001_initial'), - ('proposals', '0007_knowledgeproposal_lawproposal_testingproposal'), - ] - - operations = [ - migrations.CreateModel( - name='OpenHardwareProposal', - 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, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])), - ('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence")), - ('talk_format', models.IntegerField(choices=[(1, b'Presentation (20 min)'), (2, b'Lightning Talk (5 min)')])), - ], - options={ - 'verbose_name': 'Open Hardware Miniconf Proposal', - }, - bases=('symposion_proposals.proposalbase',), - ), - ] diff --git a/pinaxcon/proposals/migrations/0009_auto_20170222_2014.py b/pinaxcon/proposals/migrations/0009_auto_20170222_2014.py deleted file mode 100644 index 98f97255..00000000 --- a/pinaxcon/proposals/migrations/0009_auto_20170222_2014.py +++ /dev/null @@ -1,145 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2017-02-22 09:14 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0008_openhardwareproposal'), - ] - - operations = [ - migrations.AlterField( - model_name='gamesproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='gamesproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='kernelproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='kernelproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='knowledgeproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='knowledgeproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='lawproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='lawproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='openhardwareproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='openhardwareproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='openradioproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='openradioproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='securityproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='securityproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='sysadminproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='sysadminproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='talkproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='talkproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='testingproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='testingproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='tutorialproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='tutorialproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='wootconfproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='wootconfproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='writethedocsproposal', - name='materials_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - migrations.AlterField( - model_name='writethedocsproposal', - name='recording_release', - field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the Creative Commons Attribution-Share Alike Australia 3.0 Licence"), - ), - ] diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index ad5aecb3..fbc7fb9f 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -56,113 +56,3 @@ class MiniconfProposal(ProposalBase): class Meta: verbose_name = "miniconf proposal" - - -class SysAdminProposal(Proposal): - - TYPE_SHORT_PRESENTATION = 1 - TYPE_LIGHTNING_TALK = 2 - - TALK_FORMATS = [ - (TYPE_SHORT_PRESENTATION, "Short Presentation (15-25 min)"), - (TYPE_LIGHTNING_TALK, "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 = "System Administration Miniconf Proposal" - - -class WriteTheDocsProposal(Proposal): - - TYPE_LONG_PRESENTATION = 1 - TYPE_SHORT_PRESENTATION = 2 - - TALK_FORMATS = [ - (TYPE_LONG_PRESENTATION, "Long Presentation (40 min)"), - (TYPE_SHORT_PRESENTATION, "Short Presentation (20 min)"), - ] - - talk_format = models.IntegerField(choices=TALK_FORMATS) - - class Meta: - verbose_name = "WriteThe Docs Miniconf Proposal" - - -class OpenRadioProposal(Proposal): - - class Meta: - verbose_name = "OpenRadio Miniconf Proposal" - - -class WootconfProposal(Proposal): - - class Meta: - verbose_name = "WOOTCONF Miniconf Proposal" - - -class KernelProposal(Proposal): - - class Meta: - verbose_name = "Kernel Miniconf Proposal" - - -class SecurityProposal(Proposal): - - class Meta: - verbose_name = "Security/Privacy Miniconf Proposal" - - -class GamesProposal(Proposal): - - TYPE_PRESENTATION = 1 - TYPE_DEMONSTRATION = 2 - TYPE_OTHER = 3 - - TALK_FORMATS = [ - (TYPE_PRESENTATION, "Presentation"), - (TYPE_DEMONSTRATION, "Demonstration"), - (TYPE_OTHER, "Other"), - ] - - talk_format = models.IntegerField(choices=TALK_FORMATS) - - class Meta: - verbose_name = "Games and FOSS Miniconf Proposal" - - -class TestingProposal(Proposal): - - class Meta: - verbose_name = "Testing/Automation Miniconf Proposal" - - -class KnowledgeProposal(Proposal): - - class Meta: - verbose_name = "Open Knowledge Australia Miniconf Proposal" - - -class LawProposal(Proposal): - - class Meta: - verbose_name = "Open Law and Policy Miniconf Proposal" - - -class OpenHardwareProposal(Proposal): - - TYPE_NORMAL_PRESENTATION = 1 - TYPE_LIGHTNING_TALK = 2 - - TALK_FORMATS = [ - (TYPE_NORMAL_PRESENTATION, "Presentation (20 min)"), - (TYPE_LIGHTNING_TALK, "Lightning Talk (5 min)"), - ] - - talk_format = models.IntegerField(choices=TALK_FORMATS) - - class Meta: - verbose_name = "Open Hardware Miniconf Proposal"