diff --git a/pinaxcon/proposals/admin.py b/pinaxcon/proposals/admin.py index d3e2278e..85642d97 100644 --- a/pinaxcon/proposals/admin.py +++ b/pinaxcon/proposals/admin.py @@ -23,10 +23,8 @@ class CategoryAdmin(admin.ModelAdmin): for model in [ models.TalkProposal, models.TutorialProposal, models.MiniconfProposal, models.SysAdminProposal, models.KernelProposal, models.GamesProposal, - models.OpenHardwareProposal, models.ClsXLCAProposal, - models.FuncProgProposal, models.OpenEdProposal, - models.OpenGLAMProposal, models.FPGAProposal, models.DevDevProposal, - models.ArtTechProposal, models.BioInformaticsProposal ]: + models.OpenHardwareProposal, models.OpenEdProposal, + models.DevDevProposal, models.ArtTechProposal ]: admin.site.register(model, CategoryAdmin, list_display = [ "id", diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index 993a6bed..8458b49d 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -109,34 +109,10 @@ class OpenHardwareProposalForm(ProposalForm): model = OpenHardwareProposal fields = TALK_FORMAT_FIELDS -class ClsXLCAProposalForm(ProposalForm): - - class Meta: - model = ClsXLCAProposal - fields = DEFAULT_FIELDS - -class FuncProgProposalForm(ProposalForm): - - class Meta: - model = FuncProgProposal - fields = DEFAULT_FIELDS - class OpenEdProposalForm(ProposalForm): class Meta: - model = OpenEdProposal - fields = DEFAULT_FIELDS - -class OpenGLAMProposalForm(ProposalForm): - - class Meta: - model = OpenGLAMProposal - fields = DEFAULT_FIELDS - -class FPGAProposalForm(ProposalForm): - - class Meta: - model = FPGAProposal + model = OpenEdProposal fields = DEFAULT_FIELDS class DevDevProposalForm(ProposalForm): @@ -156,9 +132,3 @@ class ArtTechProposalForm(ProposalForm): model = ArtTechProposal fields = ARTTECH_FIELDS - -class BioInformaticsProposalForm(ProposalForm): - - class Meta: - model = BioInformaticsProposal - fields = DEFAULT_FIELDS diff --git a/pinaxcon/proposals/migrations/0008_auto_20180929_1555.py b/pinaxcon/proposals/migrations/0008_auto_20180929_1555.py new file mode 100644 index 00000000..932edfea --- /dev/null +++ b/pinaxcon/proposals/migrations/0008_auto_20180929_1555.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.15 on 2018-09-29 05:55 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('symposion_proposals', '0003_auto_20170702_2250'), + ('symposion_reviews', '0001_initial'), + ('symposion_schedule', '0007_auto_20161224_1709'), + ('proposals', '0007_auto_20171023_2113_squashed_0008_auto_20171023_2114'), + ] + + operations = [ + migrations.RemoveField( + model_name='bioinformaticsproposal', + name='proposalbase_ptr', + ), + migrations.RemoveField( + model_name='clsxlcaproposal', + name='proposalbase_ptr', + ), + migrations.RemoveField( + model_name='fpgaproposal', + name='proposalbase_ptr', + ), + migrations.RemoveField( + model_name='funcprogproposal', + name='proposalbase_ptr', + ), + migrations.RemoveField( + model_name='openglamproposal', + name='proposalbase_ptr', + ), + migrations.DeleteModel( + name='BioInformaticsProposal', + ), + migrations.DeleteModel( + name='ClsXLCAProposal', + ), + migrations.DeleteModel( + name='FPGAProposal', + ), + migrations.DeleteModel( + name='FuncProgProposal', + ), + migrations.DeleteModel( + name='OpenGLAMProposal', + ), + ] diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index 7a4720d8..ac9dc1c2 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -119,36 +119,12 @@ class OpenHardwareProposal(Proposal): verbose_name = "Open Hardware Miniconf Proposal" -class ClsXLCAProposal(Proposal): - - class Meta: - verbose_name = "CLSxLCA Miniconf Proposal" - - -class FuncProgProposal(Proposal): - - class Meta: - verbose_name = "Real World Functional Programming Miniconf Proposal" - - class OpenEdProposal(Proposal): class Meta: verbose_name = "Open Education Miniconf Proposal" -class OpenGLAMProposal(Proposal): - - class Meta: - verbose_name = "OpenGLAM Miniconf Proposal" - - -class FPGAProposal(Proposal): - - class Meta: - verbose_name = "FPGA Miniconf Proposal" - - class DevDevProposal(Proposal): class Meta: @@ -198,15 +174,5 @@ class ArtTechProposal(Proposal): target_audience = models.IntegerField(choices=TARGET_AUDIENCES, default=TARGET_NA) - # def __init__(self, *args, **kwargs): - # super(ArtTechProposal, self).__init__(*args, **kwargs) - # self.target_audience = 3 - class Meta: verbose_name = "Art+Tech Miniconf Proposal" - - -class BioInformaticsProposal(Proposal): - - class Meta: - verbose_name = "Open Source and BioInformatics Miniconf" diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index ca5dc43f..6f0a2c6d 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -340,14 +340,9 @@ PROPOSAL_FORMS = { "games-miniconf": "pinaxcon.proposals.forms.GamesProposalForm", "openhardware-miniconf": "pinaxcon.proposals.forms.OpenHardwareProposalForm", "kernel-miniconf": "pinaxcon.proposals.forms.KernelProposalForm", - "clsxlca-miniconf": "pinaxcon.proposals.forms.ClsXLCAProposalForm", - "funcprog-miniconf": "pinaxcon.proposals.forms.FuncProgProposalForm", "opened-miniconf": "pinaxcon.proposals.forms.OpenEdProposalForm", - "openglam-miniconf": "pinaxcon.proposals.forms.OpenGLAMProposalForm", - "fpga-miniconf": "pinaxcon.proposals.forms.FPGAProposalForm", "devdev-miniconf": "pinaxcon.proposals.forms.DevDevProposalForm", "arttech-miniconf": "pinaxcon.proposals.forms.ArtTechProposalForm", - "bioinformatics-miniconf": "pinaxcon.proposals.forms.BioInformaticsProposalForm", } # Registrasion bits: