X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/4e82deefc47c7b5d6a9ff46bbcfe1473d8eba285..7d1d531c5157041167143b04b55a44b49b389e06:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 371ea57..0d8a374 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -4,13 +4,18 @@ from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_mo
 from django.conf.urls.defaults import url, patterns
 from django.http import Http404, HttpResponse
 from datetime import datetime
+from philo.contrib.penfield.utils import paginate
+from philo.contrib.penfield.validators import validate_pagination_count
 
 
 class Blog(Entity, Titled):
 	@property
 	def entry_tags(self):
 		""" Returns a QuerySet of Tags that are used on any entries in this blog. """
-		return Tag.objects.filter(blogentries__blog=self)
+		return Tag.objects.filter(blogentries__blog=self).distinct()
+
+
+register_value_model(Blog)
 
 
 class BlogEntry(Entity, Titled):
@@ -18,8 +23,8 @@ class BlogEntry(Entity, Titled):
 	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()
-	tags = models.ManyToManyField(Tag, related_name='blogentries')
+	excerpt = models.TextField(blank=True, null=True)
+	tags = models.ManyToManyField(Tag, related_name='blogentries', blank=True, null=True)
 	
 	class Meta:
 		ordering = ['-date']
@@ -45,17 +50,21 @@ class BlogView(MultiView):
 	entry_archive_page = models.ForeignKey(Page, related_name='blog_entry_archive_related', null=True, blank=True)
 	tag_page = models.ForeignKey(Page, related_name='blog_tag_related')
 	tag_archive_page = models.ForeignKey(Page, related_name='blog_tag_archive_related', null=True, blank=True)
+	entries_per_page = models.IntegerField(blank=True, validators=[validate_pagination_count], null=True)
 	
 	entry_permalink_style = models.CharField(max_length=1, choices=ENTRY_PERMALINK_STYLE_CHOICES)
 	entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries')
 	tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags')
 	
+	def __unicode__(self):
+		return u'BlogView for %s' % self.blog.title
+	
 	@property
 	def urlpatterns(self):
 		base_patterns = patterns('',
 			url(r'^$', self.index_view),
 			url((r'^(?:%s)/?$' % self.tag_permalink_base), self.tag_archive_view),
-			url((r'^(?:%s)/(?P<tag>[-\w]+)/?$' % self.tag_permalink_base), self.tag_view)
+			url((r'^(?:%s)/(?P<tag_slugs>[-\w]+[-+/\w]*)/?$' % self.tag_permalink_base), self.tag_view)
 		)
 		if self.entry_permalink_style == 'D':
 			entry_patterns = patterns('',
@@ -87,9 +96,15 @@ class BlogView(MultiView):
 		return base_patterns + entry_patterns
 	
 	def index_view(self, request, node=None, extra_context=None):
+		entries = self.blog.entries.all()
+		if self.entries_per_page:
+			paginated_page = paginate(request, entries, self.entries_per_page)
+			entries = paginated_page.object_list
+		else:
+			paginated_page = None
 		context = {}
 		context.update(extra_context or {})
-		context.update({'blog': self.blog})
+		context.update({'blog': self.blog, 'entries': entries, 'paginated_page': paginated_page})
 		return self.index_page.render_to_response(node, request, extra_context=context)
 	
 	def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None):
@@ -119,20 +134,42 @@ class BlogView(MultiView):
 			entries = entries.filter(date__month=month)
 		if day:
 			entries = entries.filter(date__day=day)
+		if self.entries_per_page:
+			paginated_page = paginate(request, entries, self.entries_per_page)
+			entries = paginated_page.object_list
+		else:
+			paginated_page = None
 		context = {}
 		context.update(extra_context or {})
-		context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries})
+		context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries, 'paginated_page': paginated_page})
 		return self.entry_archive_page.render_to_response(node, request, extra_context=context)
 	
-	def tag_view(self, request, tag, node=None, extra_context=None):
-		try:
-			tag = self.blog.entry_tags.filter(slug=tag)
-		except:
+	def tag_view(self, request, tag_slugs, node=None, extra_context=None):
+		tags = []
+		for tag_slug in tag_slugs.replace('+', '/').split('/'):
+			if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /)
+				try:
+					tag = self.blog.entry_tags.get(slug=tag_slug)
+				except:
+					raise Http404
+				tags.append(tag)
+		if len(tags) <= 0:
 			raise Http404
-		entries = self.blog.entries.filter(tags=tag)
+		
+		entries = self.blog.entries.all()
+		for tag in tags:
+			entries = entries.filter(tags=tag)
+		if entries.count() <= 0:
+			raise Http404
+		
+		if self.entries_per_page:
+			paginated_page = paginate(request, entries, self.entries_per_page)
+			entries = paginated_page.object_list
+		else:
+			paginated_page = None
 		context = {}
 		context.update(extra_context or {})
-		context.update({'blog': self.blog, 'tag': tag, 'entries': entries})
+		context.update({'blog': self.blog, 'tags': tags, 'entries': entries, 'paginated_page': paginated_page})
 		return self.tag_page.render_to_response(node, request, extra_context=context)
 	
 	def tag_archive_view(self, request, node=None, extra_context=None):