symposion_app Files · symposion/conference/admin.py

Files @ cb4b0fac3871

Branch filter:

Location: symposion_app/symposion/conference/admin.py

cb4b0fac3871 325 B text/x-python Show Annotation Show as Raw Download as Raw

Patrick Altman

Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility

Conflicts:
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/conference/urls.py
symposion/proposals/models.py
symposion/proposals/urls.py
symposion/reviews/urls.py
symposion/schedule/models.py
symposion/schedule/urls.py
symposion/speakers/urls.py
symposion/sponsorship/urls.py
symposion/teams/urls.py

from django.contrib import admin

from symposion.conference.models import Conference, Section


admin.site.register(Conference, list_display=("title", "start_date", "end_date"))
admin.site.register(
    Section,
    prepopulated_fields={"slug": ("name",)},
    list_display=("name", "conference", "start_date", "end_date")
)