From 3122891123476615223a1de97c9e97a3a2c5ca8f Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 18 Mar 2025 22:55:39 +1100 Subject: [PATCH] Add tracks for databases and libre graphics --- pinaxcon/proposals/admin.py | 2 ++ pinaxcon/proposals/forms.py | 12 ++++++++++++ pinaxcon/proposals/models.py | 10 ++++++++++ pinaxcon/settings.py | 2 ++ 4 files changed, 26 insertions(+) diff --git a/pinaxcon/proposals/admin.py b/pinaxcon/proposals/admin.py index e9d922d9..75d7eb9c 100644 --- a/pinaxcon/proposals/admin.py +++ b/pinaxcon/proposals/admin.py @@ -21,10 +21,12 @@ class CategoryAdmin(admin.ModelAdmin): models_to_register = [ + models.DatabasesProposal, models.DistrosProposal, models.FOSSInDailyLifeProposal, models.FOSSInEducationProposal, models.LegalIssuesProposal, + models.LibreGraphicsProposal, models.LinuxKernalProposal, models.P2PLocalFirstProposal, models.ScienceOfCommunityProposal, diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index d3f1ab0a..55d888e9 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -61,6 +61,12 @@ class MiniconfProposalForm(ProposalForm): pass +class DatabasesProposalForm(MiniconfProposalForm): + class Meta: + model = models.DatabasesProposal + fields = TALK_FORMAT_FIELDS + + class DistrosProposalForm(MiniconfProposalForm): class Meta: model = models.DistrosProposal @@ -85,6 +91,12 @@ class LegalIssuesProposalForm(MiniconfProposalForm): fields = TALK_FORMAT_FIELDS +class LibreGraphicsProposalForm(MiniconfProposalForm): + class Meta: + model = models.LibreGraphicsProposal + fields = TALK_FORMAT_FIELDS + + class LinuxKernelProposalForm(MiniconfProposalForm): class Meta: model = models.LinuxKernalProposal diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index 2aaec3e6..48dd7413 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -160,6 +160,11 @@ class MiniconfSessionProposal(Proposal): abstract = True +class DatabasesProposal(MiniconfSessionProposal): + class Meta: + verbose_name = "Databases talk proposal" + + class DistrosProposal(MiniconfSessionProposal): class Meta: verbose_name = "Distros talk proposal" @@ -180,6 +185,11 @@ class LegalIssuesProposal(MiniconfSessionProposal): verbose_name = "Legal Issues talk proposal" +class LibreGraphicsProposal(MiniconfSessionProposal): + class Meta: + verbose_name = "Libre Graphics talk proposal" + + class LinuxKernalProposal(MiniconfSessionProposal): class Meta: verbose_name = "Linux Kernal talk proposal" diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index fd97d9b1..e5d9348c 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -371,10 +371,12 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = True CONFERENCE_ID = 4 PROPOSAL_FORMS = { + "databases": "pinaxcon.proposals.forms.DatabasesProposalForm", "distros": "pinaxcon.proposals.forms.DistrosProposalForm", "foss-in-daily-life": "pinaxcon.proposals.forms.FOSSInDailyLifeProposalForm", "foss-in-education": "pinaxcon.proposals.forms.FOSSInEducationProposalForm", "legal-issues": "pinaxcon.proposals.forms.LegalIssuesProposalForm", + "libre-graphics": "pinaxcon.proposals.forms.LibreGraphicsProposalForm", "linux-kernel": "pinaxcon.proposals.forms.LinuxKernelProposalForm", "peer-to-peer-local-first": "pinaxcon.proposals.forms.P2PLocalFirstProposalForm", "science-of-community": "pinaxcon.proposals.forms.ScienceOfCommunityProposalForm",