Added filter_horizontal on blogentry tags. Made minor corrections to BlogView's get_e...
[philo.git] / contrib / penfield / models.py
index 33eecb0..7385dd9 100644 (file)
@@ -178,7 +178,7 @@ class BlogView(MultiView, FeedMultiViewMixin):
                context.update({'year': year, 'month': month, 'day': day})
                return entries, context
        
-       def get_entries_by_tag(self, request, node=None, extra_context=None):
+       def get_entries_by_tag(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 /)
@@ -193,10 +193,12 @@ class BlogView(MultiView, FeedMultiViewMixin):
                entries = self.blog.entries.all()
                for tag in tags:
                        entries = entries.filter(tags=tag)
-               if entries.count() <= 0:
-                       raise Http404
                
-               return entries, extra_context
+               context = self.get_context()
+               context.update(extra_context or {})
+               context.update({'tags': tags})
+               
+               return entries, context
        
        def get_obj_description(self, obj):
                return obj.excerpt
@@ -253,12 +255,12 @@ register_value_model(NewsletterArticle)
 
 class NewsletterIssue(Entity, Titled):
        newsletter = models.ForeignKey(Newsletter, related_name='issues')
-       number = models.PositiveIntegerField()
+       numbering = models.CharField(max_length=50, help_text='For example, 04.02 for volume 4, issue 2.')
        articles = models.ManyToManyField(NewsletterArticle, related_name='issues')
        
        class Meta:
-               ordering = ['-number']
-               unique_together = (('newsletter', 'number'),)
+               ordering = ['-numbering']
+               unique_together = (('newsletter', 'numbering'),)
 
 
 register_value_model(NewsletterIssue)
@@ -288,6 +290,9 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
        feeds_enabled = models.BooleanField()
        list_var = 'articles'
        
+       def __unicode__(self):
+               return self.newsletter.__unicode__()
+       
        @property
        def feed_title(self):
                return self.newsletter.title
@@ -305,14 +310,14 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                                return reverse(self.article_view, urlconf=self, kwargs=kwargs)
                elif isinstance(obj, NewsletterIssue):
                        if obj.newsletter == self.newsletter:
-                               return reverse('issue', urlconf=self, kwargs={'number': str(obj.number)})
+                               return reverse('issue', urlconf=self, kwargs={'numbering': obj.numbering})
                raise ViewCanNotProvideSubpath
        
        @property
        def urlpatterns(self):
                urlpatterns = patterns('',
                        url(r'^', include(self.feed_patterns(self.get_all_articles, self.index_page, 'index'))),
-                       url(r'^(?:%s)/(?P<number>\d+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue')))
+                       url(r'^(?:%s)/(?P<numbering>.+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue')))
                )
                if self.issue_archive_page:
                        urlpatterns += patterns('',
@@ -368,9 +373,9 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        articles = articles.filter(date__day=day)
                return articles
        
-       def get_articles_by_issue(self, request, number, node=None, extra_context=None):
+       def get_articles_by_issue(self, request, numbering, node=None, extra_context=None):
                try:
-                       issue = self.newsletter.issues.get(number=number)
+                       issue = self.newsletter.issues.get(numbering=numbering)
                except:
                        raise Http404
                context = extra_context or {}