From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 17 Jun 2010 09:35:54 +0000 (-0400)
Subject: Merge branch 'penfield' of git://github.com/kgodey/philo into penfield
X-Git-Tag: philo-0.9~67^2~10
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/3a26d64163a61312027c18e0afce30094495ff2e?hp=6d2c7644b56ed2ecc5e274819322e077e0975fa9

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

* 'penfield' of git://github.com/kgodey/philo:
  Tags implemented in Penfield, added to blog entries.
---

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 322fe4c..49070b8 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -7,6 +7,14 @@ 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()
@@ -28,6 +36,7 @@ class BlogEntry(Entity, Titled):
 	date = models.DateTimeField(default=datetime.now)
 	content = models.TextField()
 	excerpt = models.TextField()
+	tags = models.ManyToManyField(Tag)
 	
 	class Meta:
 		ordering = ['-date']