From df7836e07e675e2a1cb8c5b1ab2d27191227de02 2018-10-24 06:34:58 From: Tobias Date: 2018-10-24 06:34:58 Subject: [PATCH] Basics for SIP Miniconf --- diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index b880b3b92e50a01934934890f49adb00433e9510..697ab5ce43f5f5def16c12a2b5e8da623c3a3f84 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -6,7 +6,7 @@ from pinaxcon.proposals.fields import HelpTextField from pinaxcon.proposals.models import TalkProposal, TutorialProposal, MiniconfProposal from pinaxcon.proposals.models import SysAdminProposal, KernelProposal, OpenHardwareProposal from pinaxcon.proposals.models import GamesProposal, DevDevProposal, ArtTechProposal -from pinaxcon.proposals.models import OpenEdProposal, DocsProposal +from pinaxcon.proposals.models import OpenEdProposal, DocsProposal, SecurityProposal DEFAULT_FIELDS = [ @@ -99,6 +99,14 @@ class SysadminProposalForm(ProposalForm): model = SysAdminProposal fields = TALK_FORMAT_FIELDS + +class SecurityProposalForm(ProposalForm): + + class Meta: + model = SecurityProposal + fields = TALK_FORMAT_FIELDS + + class KernelProposalForm(ProposalForm): class Meta: diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index c203a709dcd703cef54039e8d3e71ffe4c4cb368..6dd5f87b6c709bbf23ecb0d2fe455c515a8b7a3f 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -124,6 +124,12 @@ class KernelProposal(Proposal): verbose_name = "Kernel Miniconf Proposal" +class SecurityProposal(Proposal): + + class Meta: + verbose_name = "Security, Identity and Privacy Miniconf Proposal" + + class GamesProposal(Proposal): TYPE_PRESENTATION = 1 diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index fa8ae5ed4a5eeb3312f174b8e83b0d7db3808747..45b9513c826d25a98cddc28148bbd733fe84c14f 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -344,6 +344,7 @@ PROPOSAL_FORMS = { "devdev-miniconf": "pinaxcon.proposals.forms.DevDevProposalForm", "arttech-miniconf": "pinaxcon.proposals.forms.ArtTechProposalForm", "docs-miniconf": "pinaxcon.proposals.forms.DocsProposalForm", + "security-miniconf": "pinaxcon.proposals.forms.SecurityProposalForm" } # Registrasion bits: