From a8ca5f4d7033f91afa24acbcd015f24350ea0d26 Mon Sep 17 00:00:00 2001
From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 13 Sep 2010 11:23:36 -0400
Subject: [PATCH] Switched newsletterissue numbering to a more generic field.
 Added newsletterview unicode. Minor change to container templatetags to
 ensure that the container_content variable is always set.

---
 contrib/penfield/models.py | 17 ++++++++++-------
 templatetags/containers.py |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 33eecb0..940f7e7 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -253,12 +253,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)
@@ -288,6 +288,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
@@ -305,14 +308,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('',
@@ -368,9 +371,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 {}
diff --git a/templatetags/containers.py b/templatetags/containers.py
index 92e126e..90af297 100644
--- a/templatetags/containers.py
+++ b/templatetags/containers.py
@@ -18,6 +18,8 @@ class ContainerNode(template.Node):
 		content = settings.TEMPLATE_STRING_IF_INVALID
 		if 'page' in context:
 			container_content = self.get_container_content(context)
+		else:
+			container_content = None
 		
 		if self.as_var:
 			context[self.as_var] = container_content
-- 
2.20.1