X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/12949bcd8bca1a6c9b0171774e447b63ead6edf0..f12151e3e39812dac33c9cc4e6067efdec89f54c:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 3791e55..7385dd9 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -178,7 +178,7 @@ class BlogView(MultiView, FeedMultiViewMixin):
 		context.update({'year': year, 'month': month, 'day': day})
 		return entries, context
 	
-	def get_entries_by_tag(self, request, node=None, extra_context=None):
+	def get_entries_by_tag(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 /)
@@ -193,10 +193,12 @@ class BlogView(MultiView, FeedMultiViewMixin):
 		entries = self.blog.entries.all()
 		for tag in tags:
 			entries = entries.filter(tags=tag)
-		if entries.count() <= 0:
-			raise Http404
 		
-		return entries, extra_context
+		context = self.get_context()
+		context.update(extra_context or {})
+		context.update({'tags': tags})
+		
+		return entries, context
 	
 	def get_obj_description(self, obj):
 		return obj.excerpt
@@ -240,6 +242,7 @@ class NewsletterArticle(Entity, Titled):
 	date = models.DateTimeField(default=datetime.now)
 	lede = models.TextField(null=True, blank=True)
 	full_text = models.TextField()
+	tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)
 	
 	class Meta:
 		get_latest_by = 'date'
@@ -252,12 +255,12 @@ register_value_model(NewsletterArticle)
 
 class NewsletterIssue(Entity, Titled):
 	newsletter = models.ForeignKey(Newsletter, related_name='issues')
-	number = models.PositiveIntegerField()
+	numbering = models.CharField(max_length=50, help_text='For example, 04.02 for volume 4, issue 2.')
 	articles = models.ManyToManyField(NewsletterArticle, related_name='issues')
 	
 	class Meta:
-		ordering = ['-number']
-		unique_together = (('newsletter', 'number'),)
+		ordering = ['-numbering']
+		unique_together = (('newsletter', 'numbering'),)
 
 
 register_value_model(NewsletterIssue)
@@ -287,6 +290,9 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 	feeds_enabled = models.BooleanField()
 	list_var = 'articles'
 	
+	def __unicode__(self):
+		return self.newsletter.__unicode__()
+	
 	@property
 	def feed_title(self):
 		return self.newsletter.title
@@ -304,14 +310,14 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 				return reverse(self.article_view, urlconf=self, kwargs=kwargs)
 		elif isinstance(obj, NewsletterIssue):
 			if obj.newsletter == self.newsletter:
-				return reverse('issue', urlconf=self, kwargs={'number': str(obj.number)})
+				return reverse('issue', urlconf=self, kwargs={'numbering': obj.numbering})
 		raise ViewCanNotProvideSubpath
 	
 	@property
 	def urlpatterns(self):
 		urlpatterns = patterns('',
 			url(r'^', include(self.feed_patterns(self.get_all_articles, self.index_page, 'index'))),
-			url(r'^(?:%s)/(?P<number>\d+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue')))
+			url(r'^(?:%s)/(?P<numbering>.+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue')))
 		)
 		if self.issue_archive_page:
 			urlpatterns += patterns('',
@@ -367,9 +373,9 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 			articles = articles.filter(date__day=day)
 		return articles
 	
-	def get_articles_by_issue(self, request, number, node=None, extra_context=None):
+	def get_articles_by_issue(self, request, numbering, node=None, extra_context=None):
 		try:
-			issue = self.newsletter.issues.get(number=number)
+			issue = self.newsletter.issues.get(numbering=numbering)
 		except:
 			raise Http404
 		context = extra_context or {}