Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/pinaxcon/proposals/admin.py - annotation
5f7e5ee1bd82
882 B
text/x-python
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json
04f246d85071 04f246d85071 40a4df37675a 504cf775744a 04f246d85071 504cf775744a 504cf775744a 504cf775744a 504cf775744a 57ed5e546b34 57ed5e546b34 57ed5e546b34 57ed5e546b34 57ed5e546b34 57ed5e546b34 2e2333ed707c 35bb7102503c 35bb7102503c 35bb7102503c b66db0a4a89b 35bb7102503c 504cf775744a 504cf775744a 504cf775744a 504cf775744a 504cf775744a 504cf775744a 504cf775744a 504cf775744a | from django.contrib import admin
import models
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):
model = symposion_models.AdditionalSpeaker
inlines = [
AdditionalSpeakerInline,
]
|