X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/2af3cb7d8e4986e326c3b91233bc0aaa9c7d7c58..f91bfa1ef832989770b0c0287d9c5d20cdee9b4a:/contrib/penfield/models.py?ds=inline

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index e433b84..940f7e7 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -65,7 +65,8 @@ class BlogView(MultiView, FeedMultiViewMixin):
 	entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries')
 	tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags')
 	feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
-	feeds_enabled = models.BooleanField() 
+	feeds_enabled = models.BooleanField()
+	list_var = 'entries'
 	
 	def __unicode__(self):
 		return u'BlogView for %s' % self.blog.title
@@ -239,6 +240,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'
@@ -251,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)
@@ -284,6 +286,10 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 	
 	feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
 	feeds_enabled = models.BooleanField()
+	list_var = 'articles'
+	
+	def __unicode__(self):
+		return self.newsletter.__unicode__()
 	
 	@property
 	def feed_title(self):
@@ -302,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('',
@@ -365,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 {}
@@ -386,9 +392,9 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 			article = articles.get(slug=slug)
 		except:
 			raise Http404
-		context = {}
+		context = self.get_context()
 		context.update(extra_context or {})
-		context.update({'newsletter': self.newsletter, 'article': article})
+		context.update({'article': article})
 		return self.article_page.render_to_response(node, request, extra_context=context)
 	
 	def issue_archive_view(self, request, node=None, extra_context=None):