X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/2380185d894e5a62a20b91a0c5a3a48497fb3cfb..2f2aed7e371d11b021432124de8f9bdd436b0832:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 7da8e08..eede5a4 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -203,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')
@@ -228,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'),
@@ -248,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('',