Moved Tag, and the Titled abstract model, from penfield into philo proper. Added...

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

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 57c3e9b..8d6de3c 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -1,36 +1,33 @@
 from django.db import models
 from django.db import models

-from philo.models import Entity, MultiNode, Template, register_value_model
-from django.contrib.auth.models import User
+from django.conf import settings
+from philo.models import Tag, Titled, Entity, MultiView, Template, register_value_model

 from django.conf.urls.defaults import url, patterns
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from datetime import datetime
 
 
 from django.conf.urls.defaults import url, patterns
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from datetime import datetime
 
 

-class Titled(models.Model):
-       title = models.CharField(max_length=255)
-       slug = models.SlugField()
-       
-       class Meta:
-               abstract = True
-
-

 class Blog(Entity, Titled):
        pass
 
 
 class BlogEntry(Entity, Titled):
        blog = models.ForeignKey(Blog, related_name='entries')
 class Blog(Entity, Titled):
        pass
 
 
 class BlogEntry(Entity, Titled):
        blog = models.ForeignKey(Blog, related_name='entries')

-       author = models.ForeignKey(User, related_name='blogentries')
+       author = models.ForeignKey(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='blogentries')

        date = models.DateTimeField(default=datetime.now)
        content = models.TextField()
        excerpt = models.TextField()
        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)
 
 
 
 
 register_value_model(BlogEntry)
 
 

-class BlogNode(MultiNode):
+class BlogView(MultiView):

        PERMALINK_STYLE_CHOICES = (
                ('D', 'Year, month, and day'),
                ('M', 'Year and month'),
        PERMALINK_STYLE_CHOICES = (
                ('D', 'Year, month, and day'),
                ('M', 'Year and month'),


@@ -87,7 +84,8 @@ class BlogNode(MultiNode):
                return base_patterns + entry_patterns
        
        def index_view(self, request):
                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()
        
        def archive_view(self, request, year=None, month=None, day=None):
                entries = self.blog.entries.all()


@@ -100,7 +98,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.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()
        
        def entry_view(self, request, slug, year=None, month=None, day=None):
                entries = self.blog.entries.all()


@@ -114,4 +113,19 @@ class BlogNode(MultiNode):
                        entry = entries.get(slug=slug)
                except:
                        raise Http404
                        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 NewsletterArticle(Entity, Titled):
+       newsletter = models.ForeignKey(Newsletter, related_name='stories')
+       authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsstories')
+       date = models.DateTimeField(default=datetime.now)
+       lede = models.TextField(null=True, blank=True)
+       full_text = models.TextField()
+
+
+register_value_model(NewsletterArticle)
\ No newline at end of file