X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/eed6c3aeeb7aa25d272ad9d311f17d7d70bf0ecb..9ccb8068a1e46fca83c7cc948cb66f17f5d570d2:/contrib/penfield/models.py diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py index 7e07620..371ea57 100644 --- a/contrib/penfield/models.py +++ b/contrib/penfield/models.py @@ -30,7 +30,7 @@ register_value_model(BlogEntry) class BlogView(MultiView): - PERMALINK_STYLE_CHOICES = ( + ENTRY_PERMALINK_STYLE_CHOICES = ( ('D', 'Year, month, and day'), ('M', 'Year and month'), ('Y', 'Year'), @@ -41,11 +41,12 @@ class BlogView(MultiView): blog = models.ForeignKey(Blog, related_name='blogviews') index_page = models.ForeignKey(Page, related_name='blog_index_related') - archive_page = models.ForeignKey(Page, related_name='blog_archive_related') - tag_page = models.ForeignKey(Page, related_name='blog_tag_related') entry_page = models.ForeignKey(Page, related_name='blog_entry_related') + entry_archive_page = models.ForeignKey(Page, related_name='blog_entry_archive_related', null=True, blank=True) + tag_page = models.ForeignKey(Page, related_name='blog_tag_related') + tag_archive_page = models.ForeignKey(Page, related_name='blog_tag_archive_related', null=True, blank=True) - entry_permalink_style = models.CharField(max_length=1, choices=PERMALINK_STYLE_CHOICES) + entry_permalink_style = models.CharField(max_length=1, choices=ENTRY_PERMALINK_STYLE_CHOICES) entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries') tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags') @@ -53,35 +54,35 @@ class BlogView(MultiView): def urlpatterns(self): base_patterns = patterns('', url(r'^$', self.index_view), - url((r'^(?:%s)/?' % self.tag_permalink_base), self.tag_view), - url((r'^(?:%s)/(?P>[-\w]+)/?' % self.tag_permalink_base), self.tag_view) + url((r'^(?:%s)/?$' % self.tag_permalink_base), self.tag_archive_view), + url((r'^(?:%s)/(?P[-\w]+)/?$' % self.tag_permalink_base), self.tag_view) ) if self.entry_permalink_style == 'D': entry_patterns = patterns('', - url(r'^(?P\d{4})/?$', self.archive_view), - url(r'^(?P\d{4})/(?P\d{2})/?$', self.archive_view), - url(r'^(?P\d{4})/(?P\d{2})/(?P\d+)/?$', self.archive_view), - url(r'^(?P\d{4})/(?P\d{2})/(?P\d+)/(?P[-\w]+)/?', self.entry_view) + url(r'^(?P\d{4})/?$', self.entry_archive_view), + url(r'^(?P\d{4})/(?P\d{2})/?$', self.entry_archive_view), + url(r'^(?P\d{4})/(?P\d{2})/(?P\d{2})/?$', self.entry_archive_view), + url(r'^(?P\d{4})/(?P\d{2})/(?P\d{2})/(?P[-\w]+)/?$', self.entry_view) ) elif self.entry_permalink_style == 'M': entry_patterns = patterns('', - url(r'^(?P\d{4})/?$', self.archive_view), - url(r'^(?P\d{4})/(?P\d{2})/?$', self.archive_view), - url(r'^(?P\d{4})/(?P\d{2})/(?P>[-\w]+)/?', self.entry_view) + url(r'^(?P\d{4})/?$', self.entry_archive_view), + url(r'^(?P\d{4})/(?P\d{2})/?$', self.entry_archive_view), + url(r'^(?P\d{4})/(?P\d{2})/(?P[-\w]+)/?$', self.entry_view) ) elif self.entry_permalink_style == 'Y': entry_patterns = patterns('', - url(r'^(?P\d{4})/?$', self.archive_view), - url(r'^(?P\d{4})/(?P>[-\w]+)/?', self.entry_view) + url(r'^(?P\d{4})/?$', self.entry_archive_view), + url(r'^(?P\d{4})/(?P[-\w]+)/?$', self.entry_view) ) elif self.entry_permalink_style == 'B': entry_patterns = patterns('', - url((r'^(?:%s)/?' % self.entry_permalink_base), self.archive_view), - url((r'^(?:%s)/(?P>[-\w]+)/?' % self.entry_permalink_base), self.entry_view) + url((r'^(?:%s)/?$' % self.entry_permalink_base), self.entry_archive_view), + url((r'^(?:%s)/(?P[-\w]+)/?$' % self.entry_permalink_base), self.entry_view) ) else: entry_patterns = patterns('', - url(r'^(?P>[-\w]+)/?', self.entry_view) + url(r'^(?P[-\w]+)/?$', self.entry_view) ) return base_patterns + entry_patterns @@ -91,7 +92,7 @@ class BlogView(MultiView): context.update({'blog': self.blog}) return self.index_page.render_to_response(node, request, extra_context=context) - def archive_view(self, request, year=None, month=None, day=None, node=None, extra_context=None): + def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): entries = self.blog.entries.all() if year: entries = entries.filter(date__year=year) @@ -99,19 +100,18 @@ class BlogView(MultiView): entries = entries.filter(date__month=month) if day: entries = entries.filter(date__day=day) + try: + entry = entries.get(slug=slug) + except: + raise Http404 context = {} context.update(extra_context or {}) - context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries}) - return self.archive_page.render_to_response(node, request, extra_context=context) - - def tag_view(self, request, tag=None, node=None, extra_context=None): - entries = self.blog.entries.filter(tags__slug=tag) - context = {} - context.update(extra_context or {}) - context.update({'blog': self.blog, 'tag': tag, 'entries': entries}) - return self.tag_page.render_to_response(node, request, extra_context=context) + context.update({'blog': self.blog, 'entry': entry}) + return self.entry_page.render_to_response(node, request, extra_context=context) - def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): + def entry_archive_view(self, request, year=None, month=None, day=None, node=None, extra_context=None): + if not self.entry_archive_page: + raise Http404 entries = self.blog.entries.all() if year: entries = entries.filter(date__year=year) @@ -119,14 +119,29 @@ class BlogView(MultiView): entries = entries.filter(date__month=month) if day: entries = entries.filter(date__day=day) + context = {} + context.update(extra_context or {}) + context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries}) + return self.entry_archive_page.render_to_response(node, request, extra_context=context) + + def tag_view(self, request, tag, node=None, extra_context=None): try: - entry = entries.get(slug=slug) + tag = self.blog.entry_tags.filter(slug=tag) except: raise Http404 + entries = self.blog.entries.filter(tags=tag) context = {} context.update(extra_context or {}) - context.update({'blog': self.blog, 'entry': entry}) - return self.entry_page.render_to_response(node, request, extra_context=context) + context.update({'blog': self.blog, 'tag': tag, 'entries': entries}) + return self.tag_page.render_to_response(node, request, extra_context=context) + + def tag_archive_view(self, request, node=None, 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) class Newsletter(Entity, Titled): @@ -139,6 +154,10 @@ class NewsletterArticle(Entity, Titled): date = models.DateTimeField(default=datetime.now) lede = models.TextField(null=True, blank=True) full_text = models.TextField() + + class Meta: + ordering = ['-date'] + unique_together = (('newsletter', 'slug'),) register_value_model(NewsletterArticle) @@ -148,23 +167,68 @@ class NewsletterIssue(Entity, Titled): newsletter = models.ForeignKey(Newsletter, related_name='issues') number = models.PositiveIntegerField() articles = models.ManyToManyField(NewsletterArticle) + + class Meta: + ordering = ['-number'] + unique_together = (('newsletter', 'number'),) class NewsletterView(MultiView): + ARTICLE_PERMALINK_STYLE_CHOICES = ( + ('D', 'Year, month, and day'), + ('M', 'Year and month'), + ('Y', 'Year'), + ('S', 'Slug only') + ) + newsletter = models.ForeignKey(Newsletter, related_name='newsletterviews') index_page = models.ForeignKey(Page, related_name='newsletter_index_related') article_page = models.ForeignKey(Page, related_name='newsletter_article_related') + article_archive_page = models.ForeignKey(Page, related_name='newsletter_article_archive_related', null=True, blank=True) issue_page = models.ForeignKey(Page, related_name='newsletter_issue_related') + issue_archive_page = models.ForeignKey(Page, related_name='newsletter_issue_archive_related', null=True, blank=True) + + article_permalink_style = models.CharField(max_length=1, choices=ARTICLE_PERMALINK_STYLE_CHOICES) + article_permalink_base = models.CharField(max_length=255, blank=False, default='articles') + issue_permalink_base = models.CharField(max_length=255, blank=False, default='issues') @property def urlpatterns(self): base_patterns = patterns('', url(r'^$', self.index_view), - url(r'^articles/(?P\d{4})/(?P\d{2})/(?P\d+)/(?P[-\w]+)/?', self.article_view), - url(r'^issues/(?P\d+)/?', self.issue_view), + url((r'^(?:%s)/?$' % self.issue_permalink_base), self.issue_archive_view), + url((r'^(?:%s)/(?P\d+)/?$' % self.issue_permalink_base), self.issue_view) + ) + article_patterns = patterns('', + url((r'^(?:%s)/?$' % self.article_permalink_base), self.article_archive_view) ) - return base_patterns + if self.article_permalink_style in 'DMY': + article_patterns += patterns('', + url((r'^(?:%s)/(?P\d{4})/?$' % self.article_permalink_base), self.article_archive_view) + ) + if self.article_permalink_style in 'DM': + article_patterns += patterns('', + url((r'^(?:%s)/(?P\d{4})/(?P\d{2})/?$' % self.article_permalink_base), self.article_archive_view) + ) + if self.article_permalink_style == 'D': + article_patterns += patterns('', + url((r'^(?:%s)/(?P\d{4})/(?P\d{2})/(?P\d{2})/?$' % self.article_permalink_base), self.article_archive_view), + url((r'^(?:%s)/(?P\d{4})/(?P\d{2})/(?P\d{2})/(?P[-\w]+)/?$' % self.article_permalink_base), self.article_view) + ) + else: + article_patterns += patterns('', + url((r'^(?:%s)/(?P\d{4})/(?P\d{2})/(?P[-\w]+)/?$' % self.article_permalink_base), self.article_view) + ) + else: + article_patterns += patterns('', + url((r'^(?:%s)/(?P\d{4})/(?P[-\w]+)/?$' % self.article_permalink_base), self.article_view) + ) + else: + article_patterns += patterns('', + url((r'^(?:%s)/(?P[-\w]+)/?$' % self.article_permalink_base), self.article_view) + ) + return base_patterns + article_patterns def index_view(self, request, node=None, extra_context=None): context = {} @@ -189,6 +253,21 @@ class NewsletterView(MultiView): context.update({'newsletter': self.newsletter, 'article': article}) return self.article_page.render_to_response(node, request, extra_context=context) + def article_archive_view(self, request, year=None, month=None, day=None, node=None, extra_context=None): + if not self.article_archive_page: + raise Http404 + articles = self.newsletter.articles.all() + if year: + articles = articles.filter(date__year=year) + if month: + articles = articles.filter(date__month=month) + if day: + articles = articles.filter(date__day=day) + context = {} + context.update(extra_context or {}) + context.update({'newsletter': self.newsletter, 'year': year, 'month': month, 'day': day, 'articles': articles}) + return self.article_archive_page.render_to_response(node, request, extra_context=context) + def issue_view(self, request, number, node=None, extra_context=None): try: issue = self.newsletter.issues.get(number=number) @@ -197,4 +276,12 @@ class NewsletterView(MultiView): context = {} context.update(extra_context or {}) context.update({'newsletter': self.newsletter, 'issue': issue}) - return self.issue_page.render_to_response(node, request, extra_context=context) \ No newline at end of file + return self.issue_page.render_to_response(node, request, extra_context=context) + + def issue_archive_view(self, request, node=None, 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) \ No newline at end of file