X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/767cec415355aea0ac6af15580ffdc5e5787c04f..3d786c6d8c1bd3685ac328c7f4b811c13ea60e1a:/philo/contrib/penfield/models.py?ds=inline

diff --git a/philo/contrib/penfield/models.py b/philo/contrib/penfield/models.py
index 2a145fb..3632ff6 100644
--- a/philo/contrib/penfield/models.py
+++ b/philo/contrib/penfield/models.py
@@ -471,7 +471,7 @@ class BlogView(FeedView):
 	@property
 	def urlpatterns(self):
 		urlpatterns = self.feed_patterns(r'^', 'get_all_entries', 'index_page', 'index') +\
-			self.feed_patterns(r'^%s/(?P<tag_slugs>[-\w]+[-+/\w]*)$' % self.tag_permalink_base, 'get_entries_by_tag', 'tag_page', 'entries_by_tag')
+			self.feed_patterns(r'^%s/(?P<tag_slugs>[-\w]+[-+/\w]*)' % self.tag_permalink_base, 'get_entries_by_tag', 'tag_page', 'entries_by_tag')
 		
 		if self.tag_archive_page:
 			urlpatterns += patterns('',
@@ -512,8 +512,8 @@ class BlogView(FeedView):
 		return {'blog': self.blog}
 	
 	def get_entry_queryset(self):
-		"""Returns the default :class:`QuerySet` of :class:`BlogEntry` instances for the :class:`BlogView`."""
-		return self.blog.entries.all()
+		"""Returns the default :class:`QuerySet` of :class:`BlogEntry` instances for the :class:`BlogView` - all entries that are considered posted in the past. This allows for scheduled posting of entries."""
+		return self.blog.entries.filter(date__lte=datetime.now())
 	
 	def get_tag_queryset(self):
 		"""Returns the default :class:`QuerySet` of :class:`.Tag`\ s for the :class:`BlogView`'s :meth:`get_entries_by_tag` and :meth:`tag_archive_view`."""
@@ -831,8 +831,8 @@ class NewsletterView(FeedView):
 		return {'newsletter': self.newsletter}
 	
 	def get_article_queryset(self):
-		"""Returns the default :class:`QuerySet` of :class:`NewsletterArticle` instances for the :class:`NewsletterView`."""
-		return self.newsletter.articles.all()
+		"""Returns the default :class:`QuerySet` of :class:`NewsletterArticle` instances for the :class:`NewsletterView` - all articles that are considered posted in the past. This allows for scheduled posting of articles."""
+		return self.newsletter.articles.filter(date__lte=datetime.now())
 	
 	def get_issue_queryset(self):
 		"""Returns the default :class:`QuerySet` of :class:`NewsletterIssue` instances for the :class:`NewsletterView`."""