Tags implemented in Penfield, added to blog entries.

[philo.git] / contrib / penfield / models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 57c3e9b..49070b8 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -7,10 +7,21 @@ from django.template import RequestContext
 from datetime import datetime
 
 
+class Tag(models.Model):
+       name = models.CharField(max_length=250)
+       slug = models.SlugField()
+       
+       def __unicode__(self):
+               return self.name
+
+
 class Titled(models.Model):
        title = models.CharField(max_length=255)
        slug = models.SlugField()
        
+       def __unicode__(self):
+               return self.title
+       
        class Meta:
                abstract = True
 
@@ -25,6 +36,11 @@ class BlogEntry(Entity, Titled):
        date = models.DateTimeField(default=datetime.now)
        content = models.TextField()
        excerpt = models.TextField()
+       tags = models.ManyToManyField(Tag)
+       
+       class Meta:
+               ordering = ['-date']
+               verbose_name_plural = "Blog Entries"
 
 
 register_value_model(BlogEntry)
@@ -87,7 +103,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()
@@ -100,7 +117,8 @@ class BlogNode(MultiNode):
                return HttpResponse(self.archive_template.django_template.render(RequestContext(request, {'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries})), mimetype=self.archive_template.mimetype)
        
        def tag_view(self, request, tag=None):
-               return HttpResponse(self.tag_template.django_template.render(RequestContext(request, {'blog': self.blog, 'tag': tag, 'entries': None})), mimetype=self.tag_template.mimetype)
+               # return HttpResponse(self.tag_template.django_template.render(RequestContext(request, {'blog': self.blog, 'tag': tag, 'entries': None})), mimetype=self.tag_template.mimetype)
+               raise Http404
        
        def entry_view(self, request, slug, year=None, month=None, day=None):
                entries = self.blog.entries.all()
@@ -114,4 +132,19 @@ class BlogNode(MultiNode):
                        entry = entries.get(slug=slug)
                except:
                        raise Http404
-               return HttpResponse(self.entry_template.django_template.render(RequestContext(request, {'blog': self.blog, 'entry': entry})), mimetype=self.entry_template.mimetype)
\ No newline at end of file
+               return HttpResponse(self.entry_template.django_template.render(RequestContext(request, {'blog': self.blog, 'entry': entry})), mimetype=self.entry_template.mimetype)
+
+
+class Newsletter(Entity, Titled):
+       pass
+
+
+class NewsStory(Entity, Titled):
+       newsletter = models.ForeignKey(Newsletter, related_name='stories')
+       authors = models.ManyToManyField(User, related_name='newsstories')
+       date = models.DateTimeField(default=datetime.now)
+       lede = models.TextField(null=True, blank=True)
+       full_text = models.TextField()
+
+
+register_value_model(NewsStory)
\ No newline at end of file