expand proposal admin

pinaxcon/proposals/admin.py

@@ -2,29 +2,45 @@ from django.contrib import admin
 
 from pinaxcon.proposals import models
 from symposion.proposals import models as symposion_models
-
+from symposion.reviews.models import ProposalResult
-
-@admin.register(models.TalkProposal)
-@admin.register(models.TutorialProposal)
-@admin.register(models.MiniconfProposal)
-@admin.register(models.SysAdminProposal)
-@admin.register(models.KernelProposal)
-@admin.register(models.GamesProposal)
-@admin.register(models.OpenHardwareProposal)
-@admin.register(models.ClsXLCAProposal)
-@admin.register(models.FuncProgProposal)
-@admin.register(models.OpenEdProposal)
-@admin.register(models.OpenGLAMProposal)
-@admin.register(models.FPGAProposal)
-@admin.register(models.DevDevProposal)
-@admin.register(models.ArtTechProposal)
-@admin.register(models.BioInformaticsProposal)
 
 class CategoryAdmin(admin.ModelAdmin):
 
     class AdditionalSpeakerInline(admin.TabularInline):
         model = symposion_models.AdditionalSpeaker
 
+    class ProposalResultInline(admin.TabularInline):
+        model = ProposalResult
+        readonly_fields = ["score"]
+        fields = ["status"]
+
     inlines = [
         AdditionalSpeakerInline,
+        ProposalResultInline,
     ]
+
+
+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 ]:
+    admin.site.register(model, CategoryAdmin,
+                        list_display = [
+                            "id",
+                            "title",
+                            "speaker",
+                            "speaker_email",
+                            "kind",
+                            "target_audience",
+                            "status",
+                            "cancelled",
+                        ],
+                        list_filter = [
+                            "result__status",
+                            "cancelled",
+                        ],
+    )
+

vendor/symposion/proposals/admin.py

@@ -28,5 +28,12 @@ from symposion.proposals.models import ProposalSection, ProposalKind
 # )
 
 
-admin.site.register(ProposalSection)
+admin.site.register(ProposalSection,
+                    list_display = [
+                        "section",
+                       "start",
+                        "end",
+                        "closed",
+                        "published"
+                    ])
 admin.site.register(ProposalKind)

vendor/symposion/proposals/models.py

@@ -177,6 +177,7 @@ class ProposalBase(models.Model):
         except ObjectDoesNotExist:
             return _('Undecided')
 
+
     def speakers(self):
         yield self.speaker
         speakers = self.additional_speakers.exclude(