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

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 7da8e08..2a10e26 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -15,6 +15,11 @@ class Blog(Entity, Titled):
 	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).distinct()
+	
+	@property
+	def entry_dates(self):
+		dates = {'year': self.entries.dates('date', 'year', order='DESC'), 'month': self.entries.dates('date', 'month', order='DESC'), 'day': self.entries.dates('date', 'day', order='DESC')}
+		return dates
 
 
 register_value_model(Blog)
@@ -75,6 +80,17 @@ class BlogView(MultiView):
 		elif isinstance(obj, Tag):
 			if obj in self.blog.entry_tags:
 				return reverse(self.tag_view, urlconf=self, kwargs={'tag_slugs': obj.slug})
+		elif isinstance(obj, (str, unicode)):
+			split_obj = obj.split(':')
+			if len(split_obj) > 1:
+				entry_archive_view_args = {}
+				if split_obj[0].lower() == 'archives':
+					entry_archive_view_args.update({'year': str(int(split_obj[1])).zfill(4)})
+					if len(split_obj) > 2:
+						entry_archive_view_args.update({'month': str(int(split_obj[2])).zfill(2)})
+						if len(split_obj) > 3:
+							entry_archive_view_args.update({'day': str(int(split_obj[3])).zfill(2)})
+					return reverse(self.entry_archive_view, urlconf=self, kwargs=entry_archive_view_args)
 		raise ViewCanNotProvideSubpath
 	
 	@property
@@ -203,6 +219,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')
@@ -211,6 +230,7 @@ class NewsletterArticle(Entity, Titled):
 	full_text = models.TextField()
 	
 	class Meta:
+		get_latest_by = 'date'
 		ordering = ['-date']
 		unique_together = (('newsletter', 'slug'),)
 
@@ -221,13 +241,16 @@ register_value_model(NewsletterArticle)
 class NewsletterIssue(Entity, Titled):
 	newsletter = models.ForeignKey(Newsletter, related_name='issues')
 	number = models.PositiveIntegerField()
-	articles = models.ManyToManyField(NewsletterArticle)
+	articles = models.ManyToManyField(NewsletterArticle, related_name='issues')
 	
 	class Meta:
 		ordering = ['-number']
 		unique_together = (('newsletter', 'number'),)
 
 
+register_value_model(NewsletterIssue)
+
+
 class NewsletterView(MultiView):
 	ARTICLE_PERMALINK_STYLE_CHOICES = (
 		('D', 'Year, month, and day'),
@@ -248,6 +271,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('',