Merge branch 'master' into penfield

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

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 322fe4c..f014a1d 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -1,5 +1,5 @@
 from django.db import models
 from django.db import models

-from philo.models import Entity, MultiNode, Template, register_value_model
+from philo.models import Entity, MultiView, Template, register_value_model

 from django.contrib.auth.models import User
 from django.conf.urls.defaults import url, patterns
 from django.http import Http404, HttpResponse
 from django.contrib.auth.models import User
 from django.conf.urls.defaults import url, patterns
 from django.http import Http404, HttpResponse


@@ -7,6 +7,14 @@ from django.template import RequestContext
 from datetime import datetime
 
 
 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()
 class Titled(models.Model):
        title = models.CharField(max_length=255)
        slug = models.SlugField()


@@ -28,6 +36,7 @@ class BlogEntry(Entity, Titled):
        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']
        
        class Meta:
                ordering = ['-date']


@@ -37,7 +46,7 @@ class BlogEntry(Entity, Titled):
 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'),