X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/4b094dbc60c3853814c2523d5772e4cf2884a073..bcaf02b09b921364261bd186781f3ff1593fbee0:/contrib/penfield/models.py diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py index 8d7e3ff..0e5bce0 100644 --- a/contrib/penfield/models.py +++ b/contrib/penfield/models.py @@ -1,7 +1,9 @@ from django.db import models from django.conf import settings from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model +from philo.exceptions import ViewCanNotProvideSubpath from django.conf.urls.defaults import url, patterns +from django.core.urlresolvers import reverse from django.http import Http404, HttpResponse from datetime import datetime from philo.contrib.penfield.utils import paginate @@ -12,7 +14,10 @@ class Blog(Entity, Titled): @property 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) + return Tag.objects.filter(blogentries__blog=self).distinct() + + +register_value_model(Blog) class BlogEntry(Entity, Titled): @@ -20,8 +25,8 @@ class BlogEntry(Entity, Titled): author = models.ForeignKey(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='blogentries') date = models.DateTimeField(default=datetime.now) content = models.TextField() - excerpt = models.TextField() - tags = models.ManyToManyField(Tag, related_name='blogentries') + excerpt = models.TextField(blank=True, null=True) + tags = models.ManyToManyField(Tag, related_name='blogentries', blank=True, null=True) class Meta: ordering = ['-date'] @@ -47,18 +52,37 @@ class BlogView(MultiView): 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) - entries_per_page = models.IntegerField(blank=True, validators=[validate_pagination_count]) + entries_per_page = models.IntegerField(blank=True, validators=[validate_pagination_count], null=True) 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') + def __unicode__(self): + return u'BlogView for %s' % self.blog.title + + def get_subpath(self, obj): + if isinstance(obj, BlogEntry): + if obj.blog == self.blog: + entry_view_args = {'slug': obj.slug} + if self.entry_permalink_style in 'DMY': + entry_view_args.update({'year': str(obj.date.year).zfill(4)}) + if self.entry_permalink_style in 'DM': + entry_view_args.update({'month': str(obj.date.month).zfill(2)}) + if self.entry_permalink_style == 'D': + entry_view_args.update({'day': str(obj.date.day).zfill(2)}) + return reverse(self.entry_view, urlconf=self, kwargs=entry_view_args) + elif isinstance(obj, Tag): + if obj in self.blog.entry_tags: + return reverse(self.tag_view, urlconf=self, kwargs={'tag_slugs': obj.slug}) + raise ViewCanNotProvideSubpath + @property def urlpatterns(self): base_patterns = patterns('', url(r'^$', self.index_view), url((r'^(?:%s)/?$' % self.tag_permalink_base), self.tag_archive_view), - url((r'^(?:%s)/(?P[-\w]+)/?$' % self.tag_permalink_base), self.tag_view) + url((r'^(?:%s)/(?P[-\w]+[-+/\w]*)/?$' % self.tag_permalink_base), self.tag_view) ) if self.entry_permalink_style == 'D': entry_patterns = patterns('', @@ -138,12 +162,24 @@ class BlogView(MultiView): context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries, 'paginated_page': paginated_page}) 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: - tag = self.blog.entry_tags.filter(slug=tag) - except: + def tag_view(self, request, tag_slugs, node=None, extra_context=None): + tags = [] + for tag_slug in tag_slugs.replace('+', '/').split('/'): + if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /) + try: + tag = self.blog.entry_tags.get(slug=tag_slug) + except: + raise Http404 + tags.append(tag) + if len(tags) <= 0: + raise Http404 + + entries = self.blog.entries.all() + for tag in tags: + entries = entries.filter(tags=tag) + if entries.count() <= 0: raise Http404 - entries = self.blog.entries.filter(tags=tag) + if self.entries_per_page: paginated_page = paginate(request, entries, self.entries_per_page) entries = paginated_page.object_list @@ -151,7 +187,7 @@ class BlogView(MultiView): paginated_page = None context = {} context.update(extra_context or {}) - context.update({'blog': self.blog, 'tag': tag, 'entries': entries, 'paginated_page': paginated_page}) + context.update({'blog': self.blog, 'tags': tags, 'entries': entries, 'paginated_page': paginated_page}) return self.tag_page.render_to_response(node, request, extra_context=context) def tag_archive_view(self, request, node=None, extra_context=None): @@ -212,6 +248,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('',