X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/872b260781ffcc72f81549bc92bde8ca4eb2155e..be40499f02a3457bb17a8dc02a78224823eb1406:/contrib/penfield/models.py?ds=sidebyside diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py index 0883811..d3eea16 100644 --- a/contrib/penfield/models.py +++ b/contrib/penfield/models.py @@ -37,6 +37,7 @@ class BlogEntry(Entity, Titled): class Meta: ordering = ['-date'] verbose_name_plural = "blog entries" + get_latest_by = "date" register_value_model(BlogEntry) @@ -104,7 +105,12 @@ class BlogView(MultiView, FeedMultiViewMixin): def urlpatterns(self): urlpatterns = patterns('', url(r'^', include(self.feed_patterns(self.get_all_entries, self.index_page, 'index'))), - url(r'^%s/(?P[-\w]+[-+/\w]*)/%s/' % (self.tag_permalink_base, self.feed_suffix), self.feed_view(self.get_entries_by_tag, 'entries_by_tag_feed'), name='entries_by_tag_feed'), + ) + if self.feeds_enabled: + urlpatterns += patterns('', + url(r'^%s/(?P[-\w]+[-+/\w]*)/%s/' % (self.tag_permalink_base, self.feed_suffix), self.feed_view(self.get_entries_by_tag, 'entries_by_tag_feed'), name='entries_by_tag_feed'), + ) + urlpatterns += patterns('', url(r'^%s/(?P[-\w]+[-+/\w]*)/' % self.tag_permalink_base, self.page_view(self.get_entries_by_tag, self.tag_page), name='entries_by_tag') ) if self.tag_archive_page: @@ -148,10 +154,10 @@ class BlogView(MultiView, FeedMultiViewMixin): ) return urlpatterns - def get_all_entries(self, request, node=None, extra_context=None): + def get_all_entries(self, request, extra_context=None): return self.blog.entries.all(), extra_context - def get_entries_by_ymd(self, request, year=None, month=None, day=None, node=None, extra_context=None): + def get_entries_by_ymd(self, request, year=None, month=None, day=None, extra_context=None): if not self.entry_archive_page: raise Http404 entries = self.blog.entries.all() @@ -166,7 +172,7 @@ class BlogView(MultiView, FeedMultiViewMixin): context.update({'year': year, 'month': month, 'day': day}) return entries, context - def get_entries_by_tag(self, request, tag_slugs, node=None, extra_context=None): + def get_entries_by_tag(self, request, tag_slugs, extra_context=None): tags = [] for tag_slug in tag_slugs.replace('+', '/').split('/'): if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /) @@ -211,7 +217,7 @@ class BlogView(MultiView, FeedMultiViewMixin): defaults.update(kwargs or {}) return super(BlogView, self).get_feed(feed_type, extra_context, defaults) - def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): + def entry_view(self, request, slug, year=None, month=None, day=None, extra_context=None): entries = self.blog.entries.all() if year: entries = entries.filter(date__year=year) @@ -226,15 +232,15 @@ class BlogView(MultiView, FeedMultiViewMixin): context = self.get_context() context.update(extra_context or {}) context.update({'entry': entry}) - return self.entry_page.render_to_response(node, request, extra_context=context) + return self.entry_page.render_to_response(request, extra_context=context) - def tag_archive_view(self, request, node=None, extra_context=None): + def tag_archive_view(self, request, extra_context=None): if not self.tag_archive_page: raise Http404 context = {} context.update(extra_context or {}) context.update({'blog': self.blog}) - return self.tag_archive_page.render_to_response(node, request, extra_context=context) + return self.tag_archive_page.render_to_response(request, extra_context=context) class Newsletter(Entity, Titled): @@ -249,7 +255,7 @@ class NewsletterArticle(Entity, Titled): authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsletterarticles') date = models.DateTimeField(default=datetime.now) lede = TemplateField(null=True, blank=True, verbose_name='Summary') - full_text = TemplateField() + full_text = TemplateField(db_index=True) tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True) class Meta: @@ -373,10 +379,10 @@ class NewsletterView(MultiView, FeedMultiViewMixin): def get_context(self): return {'newsletter': self.newsletter} - def get_all_articles(self, request, node, extra_context=None): + def get_all_articles(self, request, extra_context=None): return self.newsletter.articles.all(), extra_context - def get_articles_by_ymd(self, request, year, month=None, day=None, node=None, extra_context=None): + def get_articles_by_ymd(self, request, year, month=None, day=None, extra_context=None): articles = self.newsletter.articles.filter(dat__year=year) if month: articles = articles.filter(date__month=month) @@ -384,16 +390,16 @@ class NewsletterView(MultiView, FeedMultiViewMixin): articles = articles.filter(date__day=day) return articles - def get_articles_by_issue(self, request, numbering, node=None, extra_context=None): + def get_articles_by_issue(self, request, numbering, extra_context=None): try: issue = self.newsletter.issues.get(numbering=numbering) - except: + except NewsletterIssue.DoesNotExist: raise Http404 context = extra_context or {} context.update({'issue': issue}) return issue.articles.all(), context - def article_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): + def article_view(self, request, slug, year=None, month=None, day=None, extra_context=None): articles = self.newsletter.articles.all() if year: articles = articles.filter(date__year=year) @@ -403,25 +409,25 @@ class NewsletterView(MultiView, FeedMultiViewMixin): articles = articles.filter(date__day=day) try: article = articles.get(slug=slug) - except: + except NewsletterArticle.DoesNotExist: raise Http404 context = self.get_context() context.update(extra_context or {}) context.update({'article': article}) - return self.article_page.render_to_response(node, request, extra_context=context) + return self.article_page.render_to_response(request, extra_context=context) - def issue_archive_view(self, request, node=None, extra_context=None): + def issue_archive_view(self, request, extra_context=None): if not self.issue_archive_page: raise Http404 context = {} context.update(extra_context or {}) context.update({'newsletter': self.newsletter}) - return self.issue_archive_page.render_to_response(node, request, extra_context=context) + return self.issue_archive_page.render_to_response(request, extra_context=context) def add_item(self, feed, obj, kwargs=None): defaults = { 'title': obj.title, - 'author_name': ', '.join(obj.authors), + 'author_name': ', '.join([author.get_full_name() for author in obj.authors.all()]), 'pubdate': obj.date, 'description': obj.lede or obj.full_text, 'categories': [tag.name for tag in obj.tags.all()] @@ -436,4 +442,4 @@ class NewsletterView(MultiView, FeedMultiViewMixin): 'title': title } defaults.update(kwargs or {}) - return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults) \ No newline at end of file + return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults)