From e09f6c7e053794cffef4b9fc00df4ebe0628846e Mon Sep 17 00:00:00 2001
From: Howard Edson <howard.edson@gmail.com>
Date: Sun, 23 Feb 2014 20:27:49 -0800
Subject: [PATCH] Edson homework 7

---
 assignments/session07/mysite/manage.py        |   0
 assignments/session07/mysite/myblog/admin.py  |  27 +++++++++++++++---
 assignments/session07/mysite/myblog/models.py |   7 ++++-
 assignments/session07/mysite/mysite.db        | Bin 155648 -> 155648 bytes
 4 files changed, 29 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 assignments/session07/mysite/manage.py

diff --git a/assignments/session07/mysite/manage.py b/assignments/session07/mysite/manage.py
old mode 100755
new mode 100644
diff --git a/assignments/session07/mysite/myblog/admin.py b/assignments/session07/mysite/myblog/admin.py
index 67aec2d6..56cd070f 100644
--- a/assignments/session07/mysite/myblog/admin.py
+++ b/assignments/session07/mysite/myblog/admin.py
@@ -1,6 +1,25 @@
 from django.contrib import admin
-from myblog.models import Post
-from myblog.models import Category
+from myblog.models import Post, Category
 
-admin.site.register(Post)
-admin.site.register(Category)
+
+class CategoryInline(admin.TabularInline):
+    model = Category.posts.through
+
+
+class PostAdmin(admin.ModelAdmin):
+    readonly_fields = ('created_date', 'modified_date', )
+    list_display = ('title', 'created_date', 'modified_date', 'published_date', 'author', )
+    list_display_links = ('title', )
+    fields = ('title', 'created_date', 'modified_date', 'published_date', 'author')
+    inlines = [CategoryInline, ]
+    list_filter = ('published_date', 'author')
+    search_fields = ['title', ]
+
+
+class CategoryAdmin(admin.ModelAdmin):
+    exclude = ('posts', )
+    list_display = ('name','description', )
+
+
+admin.site.register(Post, PostAdmin)
+admin.site.register(Category, CategoryAdmin)
\ No newline at end of file
diff --git a/assignments/session07/mysite/myblog/models.py b/assignments/session07/mysite/myblog/models.py
index 29b851c7..5abc2edb 100644
--- a/assignments/session07/mysite/myblog/models.py
+++ b/assignments/session07/mysite/myblog/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 
+
 class Post(models.Model):
 	title = models.CharField(max_length=128)
 	text = models.TextField(blank=True)
@@ -12,6 +13,7 @@ class Post(models.Model):
 	def __unicode__(self):
 		return self.title
 
+
 class Category(models.Model):
     name = models.CharField(max_length=128)
     description = models.TextField(blank=True)
@@ -19,4 +21,7 @@ class Category(models.Model):
                                    related_name='categories')
 
     def __unicode__(self):
-        return self.name
\ No newline at end of file
+        return self.name
+
+    class Meta:
+        verbose_name_plural = "categories"
diff --git a/assignments/session07/mysite/mysite.db b/assignments/session07/mysite/mysite.db
index 63c9e9a57dbf40bdfacafb2a0d046cc8f04f22df..fac26f8f936663b46c704002543ecd19d778c998 100644
GIT binary patch
delta 778
zcmah{PiWI{7|m}@4k<KWhp?`jt~m&Evee|4WNCAl>xSZC)1s)SF|#I3Gn-^>%0>~S
z_3C9>q#isBh8Hh7dzcqt6K@`-2R*1T<}Mqu34-&WL({4#OxW$gd++=AzREIPS*GW@
zQTo>55h_h^A9@${d0;4JkAT<k0ItJ%X0Op6{>WUuK+!~sMi4>cm=`3D#~c<}UQtC^
z#mTrNVxH$oLDOx^X&cFDj%ny@)+&0X2}iSyem1ZDhOFl3tYK?bK7O36RbpKYCw6z9
zOcRi9v=5zzaFs(LqS~9HBhg5brp21RdWn-*UQ)5BN=jUkB{7j~bvonDYDN8&?zv8`
z1>;5&*WRxldHj+LcLtdi0yf||JcN5tgo`i)hnQVv#oy^ZBa1<bNJaZHTFEfoVwszE
zy%JkA@><Dq9WQ51+vUl;YyROUn!MN8-C<B?5HJBd@B-e#Q<#TQz;F$2!WF-82XsZr
zXdn8YIanM0@gx`s4HMA8^oNFhxfD89H7RQB#&}A}O_`Y~Giln^jGIXoa*3;j$#SVw
znDh#sV0raHK#x>`|9gr7oD{@F)g)Vf-OdY2J|hl@PL{{Bo>oxGGlHRIWuvSpSZewg
z+Z7gLm6ugniOY$EpIW^G&`vM_HUYQ6h9y6R2{?N+Foq5)NH#?WO-(gL^&UWM{ap<8
zF%)bP@EyLwXV`{Kzu6n0$N-I~`t}JF@#&3bWZ&Qme1a{Xeg*Zlb8Qr&mbOl!?m2(Z
l1p?OL87%nZ9T@Bhq|mRI6uJGkq5h@$eY=xO>uV@h`3W@6=v)8*

delta 364
zcmYk1J4ixN0EW-0V|XL)Zv;2UNP{8_l<V;=L|W1i1|in0B$?m?EF%m;=N3iCh6d*v
zq8x4nflymREe$;&tjR^19HOWTEv+Bl2mfDe3dN>SHqc;YbY2rAmbb~XcpU=_VS)!7
zV-MlRpnncM)2v!Fjx;jH!#ax)L{z#6eaTF9q%;)}hIKlxAOxz>yVV8RWb^vC+sExz
zkIl(Fu2?*s%&g~A+sW)&Y%`Wh`V;9`GG$%Mrnzi$SY&SDYUJ_R9X^N0%DKzyaGu{Y
zy(EZTf_L2D6i3Km1%3>P-Nv~7MQn6CB9#P$2s*gM6RuE42)o!vR2|1r4gFkbDI@|3
zeJc4Db)O|opkOcT<P!O<jhY17Q3ZuSfuag0U=zJdv^EB6sy!R2Sz#aa3kNb~jG;}G
qewjX^vaD6wv(!*l(-uJs*J^qR!_40myG3^W|1W#pveJ5`#^Nt42x&0@