X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/d0dbd3635a4c1d1c47040fd17f5a8d2bec08a7e9..c5586d632dc2cf5b06af929b2cb38131042c0ed6:/philo/contrib/penfield/models.py?ds=sidebyside

diff --git a/philo/contrib/penfield/models.py b/philo/contrib/penfield/models.py
index b22dfa1..a57459c 100644
--- a/philo/contrib/penfield/models.py
+++ b/philo/contrib/penfield/models.py
@@ -5,10 +5,12 @@ from django.conf import settings
 from django.conf.urls.defaults import url, patterns, include
 from django.db import models
 from django.http import Http404, HttpResponse
+from taggit.managers import TaggableManager
+from taggit.models import Tag, TaggedItem
 
 from philo.contrib.winer.models import FeedView
 from philo.exceptions import ViewCanNotProvideSubpath
-from philo.models import Tag, Entity, Page, register_value_model
+from philo.models import Entity, Page, register_value_model
 from philo.models.fields import TemplateField
 from philo.utils import paginate
 
@@ -27,7 +29,11 @@ class Blog(Entity):
 	@property
 	def entry_tags(self):
 		"""Returns a :class:`QuerySet` of :class:`.Tag`\ s that are used on any entries in this blog."""
-		return Tag.objects.filter(blogentries__blog=self).distinct()
+		entry_pks = list(self.entries.values_list('pk', flat=True))
+		kwargs = {
+			'%s__object_id__in' % TaggedItem.tag_relname(): entry_pks
+		}
+		return TaggedItem.tags_for(BlogEntry).filter(**kwargs)
 	
 	@property
 	def entry_dates(self):
@@ -57,13 +63,13 @@ class BlogEntry(Entity):
 	date = models.DateTimeField(default=None)
 	
 	#: The content of the :class:`BlogEntry`.
-	content = models.TextField()
+	content = TemplateField()
 	
 	#: An optional brief excerpt from the :class:`BlogEntry`.
-	excerpt = models.TextField(blank=True, null=True)
+	excerpt = TemplateField(blank=True, null=True)
 	
-	#: :class:`.Tag`\ s for this :class:`BlogEntry`.
-	tags = models.ManyToManyField(Tag, related_name='blogentries', blank=True, null=True)
+	#: A ``django-taggit`` :class:`TaggableManager`.
+	tags = TaggableManager()
 	
 	def save(self, *args, **kwargs):
 		if self.date is None:
@@ -375,8 +381,8 @@ class NewsletterArticle(Entity):
 	lede = TemplateField(null=True, blank=True, verbose_name='Summary')
 	#: A :class:`.TemplateField` containing the full text of the article.
 	full_text = TemplateField(db_index=True)
-	#: A :class:`ManyToManyField` to :class:`.Tag`\ s for the :class:`NewsletterArticle`.
-	tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)
+	#: A ``django-taggit`` :class:`TaggableManager`.
+	tags = TaggableManager()
 	
 	def save(self, *args, **kwargs):
 		if self.date is None: