X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/776f7c515dfb9019906dfb7dd5d9f78182add931..3b1d871f1c800bac4d1a9ce85ee2eb5c5c19a4f0:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index d1695e7..eede5a4 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -1,7 +1,9 @@
 from django.db import models
 from django.conf import settings
 from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model
+from philo.exceptions import ViewCanNotProvideSubpath
 from django.conf.urls.defaults import url, patterns
+from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponse
 from datetime import datetime
 from philo.contrib.penfield.utils import paginate
@@ -12,7 +14,7 @@ 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)
@@ -59,12 +61,28 @@ class BlogView(MultiView):
 	def __unicode__(self):
 		return u'BlogView for %s' % self.blog.title
 	
+	def get_subpath(self, obj):
+		if isinstance(obj, BlogEntry):
+			if obj.blog == self.blog:
+				entry_view_args = {'slug': obj.slug}
+				if self.entry_permalink_style in 'DMY':
+					entry_view_args.update({'year': str(obj.date.year).zfill(4)})
+					if self.entry_permalink_style in 'DM':
+						entry_view_args.update({'month': str(obj.date.month).zfill(2)})
+						if self.entry_permalink_style == 'D':
+							entry_view_args.update({'day': str(obj.date.day).zfill(2)})
+				return reverse(self.entry_view, urlconf=self, kwargs=entry_view_args)
+		elif isinstance(obj, Tag):
+			if obj in self.blog.entry_tags:
+				return reverse(self.tag_view, urlconf=self, kwargs={'tag_slugs': obj.slug})
+		raise ViewCanNotProvideSubpath
+	
 	@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('',
@@ -144,12 +162,24 @@ class BlogView(MultiView):
 		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.all()
+		for tag in tags:
+			entries = entries.filter(tags=tag)
+		if entries.count() <= 0:
 			raise Http404
-		entries = self.blog.entries.filter(tags=tag)
+		
 		if self.entries_per_page:
 			paginated_page = paginate(request, entries, self.entries_per_page)
 			entries = paginated_page.object_list
@@ -157,7 +187,7 @@ class BlogView(MultiView):
 			paginated_page = None
 		context = {}
 		context.update(extra_context or {})
-		context.update({'blog': self.blog, 'tag': tag, 'entries': entries, 'paginated_page': paginated_page})
+		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):
@@ -173,6 +203,9 @@ class Newsletter(Entity, Titled):
 	pass
 
 
+register_value_model(Newsletter)
+
+
 class NewsletterArticle(Entity, Titled):
 	newsletter = models.ForeignKey(Newsletter, related_name='articles')
 	authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsletterarticles')
@@ -198,6 +231,9 @@ class NewsletterIssue(Entity, Titled):
 		unique_together = (('newsletter', 'number'),)
 
 
+register_value_model(NewsletterIssue)
+
+
 class NewsletterView(MultiView):
 	ARTICLE_PERMALINK_STYLE_CHOICES = (
 		('D', 'Year, month, and day'),
@@ -218,6 +254,22 @@ class NewsletterView(MultiView):
 	article_permalink_base = models.CharField(max_length=255, blank=False, default='articles')
 	issue_permalink_base = models.CharField(max_length=255, blank=False, default='issues')
 	
+	def get_subpath(self, obj):
+		if isinstance(obj, NewsletterArticle):
+			if obj.newsletter == self.newsletter:
+				article_view_args = {'slug': obj.slug}
+				if self.article_permalink_style in 'DMY':
+					article_view_args.update({'year': str(obj.date.year).zfill(4)})
+					if self.article_permalink_style in 'DM':
+						article_view_args.update({'month': str(obj.date.month).zfill(2)})
+						if self.article_permalink_style == 'D':
+							article_view_args.update({'day': str(obj.date.day).zfill(2)})
+				return reverse(self.article_view, urlconf=self, kwargs=article_view_args)
+		elif isinstance(obj, NewsletterIssue):
+			if obj.newsletter == self.newsletter:
+				return reverse(self.issue_view, urlconf=self, kwargs={'number': str(obj.number)})
+		raise ViewCanNotProvideSubpath
+	
 	@property
 	def urlpatterns(self):
 		base_patterns = patterns('',