From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 16 Jun 2010 15:31:50 +0000 (-0400)
Subject: Merge branch 'penfield' of git://github.com/kgodey/philo into penfield
X-Git-Tag: philo-0.9~67^2~12
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/77910c8b4d5e1661e53f2a0500fa23654b677c4a?hp=cf2b9630938e8c74f7037adacd2f5f0a4b6f2faa

Merge branch 'penfield' of git://github.com/kgodey/philo into penfield

* 'penfield' of git://github.com/kgodey/philo:
  The index template gets a queryset of entries now.
  Fixed date ordering.
  Fixed blog entries plural and ordering.
---

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index ae62c33..322fe4c 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -28,6 +28,10 @@ class BlogEntry(Entity, Titled):
 	date = models.DateTimeField(default=datetime.now)
 	content = models.TextField()
 	excerpt = models.TextField()
+	
+	class Meta:
+		ordering = ['-date']
+		verbose_name_plural = "Blog Entries"
 
 
 register_value_model(BlogEntry)
@@ -90,7 +94,8 @@ class BlogNode(MultiNode):
 		return base_patterns + entry_patterns
 	
 	def index_view(self, request):
-		return HttpResponse(self.index_template.django_template.render(RequestContext(request, {'blog': self.blog})), mimetype=self.index_template.mimetype)
+		entries = self.blog.entries.order_by('-date')
+		return HttpResponse(self.index_template.django_template.render(RequestContext(request, {'blog': self.blog, 'entries': entries})), mimetype=self.index_template.mimetype)
 	
 	def archive_view(self, request, year=None, month=None, day=None):
 		entries = self.blog.entries.all()