Mercurial > public > bravenewsurf

changeset 20:7fce0720f89b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging latest code with mine.
author Brian Neal <bgneal@gmail.com>
date Mon, 31 Oct 2011 20:47:29 -0500
parents ef4155f8c234 (current diff) abe08d74dab3 (diff)
children 0bac5dfbcc7c
files
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bns_website/bands/admin.py	Mon Oct 31 20:46:03 2011 -0500
+++ b/bns_website/bands/admin.py	Mon Oct 31 20:47:29 2011 -0500
@@ -4,7 +4,6 @@
 """
 from django.contrib import admin
 from bands.models import Band
-from news.models import News
 
 
 class BandAdmin(admin.ModelAdmin):
@@ -12,4 +11,3 @@
     list_editable = ['order']
 
 admin.site.register(Band, BandAdmin)
-admin.site.register(News)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bns_website/news/admin.py	Mon Oct 31 20:47:29 2011 -0500
@@ -0,0 +1,8 @@
+"""
+Automatic admin definitions for the models in the bands application.
+
+"""
+from django.contrib import admin
+from news.models import News
+
+admin.site.register(News)