diff --git a/example2/example2/settings.py b/example2/example2/settings.py index b4ca51f..17f8a5a 100644 --- a/example2/example2/settings.py +++ b/example2/example2/settings.py @@ -115,8 +115,7 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', + 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'floppyforms', diff --git a/example2/example2/urls.py b/example2/example2/urls.py index b3fe8d2..34f1f72 100644 --- a/example2/example2/urls.py +++ b/example2/example2/urls.py @@ -1,4 +1,7 @@ from django.conf.urls import patterns, include, url +from django.contrib import admin + +admin.autodiscover() import djadmin2 @@ -6,4 +9,5 @@ djadmin2.default.autodiscover() urlpatterns = patterns('', url(r'^admin2/', include(djadmin2.default.urls)), + url(r'^admin/', include(admin.site.urls)), ) diff --git a/example2/polls/admin.py b/example2/polls/admin.py new file mode 100644 index 0000000..b8783b7 --- /dev/null +++ b/example2/polls/admin.py @@ -0,0 +1,23 @@ +from django.contrib import admin + +from .models import Poll, Choice + + +class ChoiceInline(admin.TabularInline): + model = Choice + extra = 3 + + +class PollAdmin(admin.ModelAdmin): + fieldsets = [ + (None, {'fields': ['question']}), + ('Date information', {'fields': ['pub_date'], 'classes': ['collapse']}), + ] + inlines = [ChoiceInline] + list_display = ('question', 'pub_date', 'was_published_recently') + list_filter = ['pub_date'] + search_fields = ['question'] + date_hierarchy = 'pub_date' + + +admin.site.register(Poll, PollAdmin)