Fixed login redirects

[philo.git] / contrib / penfield / models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index f6c827a..940f7e7 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -65,7 +65,8 @@ class BlogView(MultiView, FeedMultiViewMixin):
        entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries')
        tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags')
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
        entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries')
        tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags')
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)

-       feeds_enabled = models.BooleanField() 
+       feeds_enabled = models.BooleanField()
+       list_var = 'entries'

        
        def __unicode__(self):
                return u'BlogView for %s' % self.blog.title
        
        def __unicode__(self):
                return u'BlogView for %s' % self.blog.title


@@ -81,28 +82,32 @@ class BlogView(MultiView, FeedMultiViewMixin):
        def get_subpath(self, obj):
                if isinstance(obj, BlogEntry):
                        if obj.blog == self.blog:
        def get_subpath(self, obj):
                if isinstance(obj, BlogEntry):
                        if obj.blog == self.blog:

-                               entry_view_args = {'slug': obj.slug}
+                               kwargs = {'slug': obj.slug}

                                if self.entry_permalink_style in 'DMY':
                                if self.entry_permalink_style in 'DMY':

-                                       entry_view_args.update({'year': str(obj.date.year).zfill(4)})
+                                       kwargs.update({'year': str(obj.date.year).zfill(4)})

                                        if self.entry_permalink_style in 'DM':
                                        if self.entry_permalink_style in 'DM':

-                                               entry_view_args.update({'month': str(obj.date.month).zfill(2)})
+                                               kwargs.update({'month': str(obj.date.month).zfill(2)})

                                                if self.entry_permalink_style == 'D':
                                                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)
+                                                       kwargs.update({'day': str(obj.date.day).zfill(2)})
+                               return reverse(self.entry_view, urlconf=self, kwargs=kwargs)

                elif isinstance(obj, Tag):
                        if obj in self.blog.entry_tags:
                elif isinstance(obj, Tag):
                        if obj in self.blog.entry_tags:

-                               return reverse(self.tag_view, urlconf=self, kwargs={'tag_slugs': obj.slug})
+                               return reverse('entries_by_tag', urlconf=self, kwargs={'tag_slugs': obj.slug})

                elif isinstance(obj, (str, unicode)):
                        split_obj = obj.split(':')
                        if len(split_obj) > 1:
                elif isinstance(obj, (str, unicode)):
                        split_obj = obj.split(':')
                        if len(split_obj) > 1:

-                               entry_archive_view_args = {}
-                               if split_obj[0].lower() == 'archives':
-                                       entry_archive_view_args.update({'year': str(int(split_obj[1])).zfill(4)})
+                               kwargs = {}
+                               try:
+                                       kwargs.update({'year': str(int(split_obj[1])).zfill(4)})

                                        if len(split_obj) > 2:
                                        if len(split_obj) > 2:

-                                               entry_archive_view_args.update({'month': str(int(split_obj[2])).zfill(2)})
+                                               kwargs.update({'month': str(int(split_obj[2])).zfill(2)})

                                                if len(split_obj) > 3:
                                                if len(split_obj) > 3:

-                                                       entry_archive_view_args.update({'day': str(int(split_obj[3])).zfill(2)})
-                                       return reverse(self.entry_archive_view, urlconf=self, kwargs=entry_archive_view_args)
+                                                       kwargs.update({'day': str(int(split_obj[3])).zfill(2)})
+                                                       return reverse('entries_by_day', urlconf=self, kwargs=kwargs)
+                                               return reverse('entries_by_month', urlconf=self, kwargs=kwargs)
+                                       return reverse('entries_by_year', urlconf=self, kwargs=kwargs)
+                               except:
+                                       pass

                raise ViewCanNotProvideSubpath
        
        def get_context(self):
                raise ViewCanNotProvideSubpath
        
        def get_context(self):


@@ -235,6 +240,7 @@ class NewsletterArticle(Entity, Titled):
        date = models.DateTimeField(default=datetime.now)
        lede = models.TextField(null=True, blank=True)
        full_text = models.TextField()
        date = models.DateTimeField(default=datetime.now)
        lede = models.TextField(null=True, blank=True)
        full_text = models.TextField()

+       tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)

        
        class Meta:
                get_latest_by = 'date'
        
        class Meta:
                get_latest_by = 'date'


@@ -247,12 +253,12 @@ register_value_model(NewsletterArticle)
 
 class NewsletterIssue(Entity, Titled):
        newsletter = models.ForeignKey(Newsletter, related_name='issues')
 
 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:
        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)
 
 
 register_value_model(NewsletterIssue)


@@ -280,6 +286,10 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
        
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
        feeds_enabled = models.BooleanField()
        
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
        feeds_enabled = models.BooleanField()

+       list_var = 'articles'
+       
+       def __unicode__(self):
+               return self.newsletter.__unicode__()

        
        @property
        def feed_title(self):
        
        @property
        def feed_title(self):


@@ -288,24 +298,24 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
        def get_subpath(self, obj):
                if isinstance(obj, NewsletterArticle):
                        if obj.newsletter == self.newsletter:
        def get_subpath(self, obj):
                if isinstance(obj, NewsletterArticle):
                        if obj.newsletter == self.newsletter:

-                               article_view_args = {'slug': obj.slug}
+                               kwargs = {'slug': obj.slug}

                                if self.article_permalink_style in 'DMY':
                                if self.article_permalink_style in 'DMY':

-                                       article_view_args.update({'year': str(obj.date.year).zfill(4)})
+                                       kwargs.update({'year': str(obj.date.year).zfill(4)})

                                        if self.article_permalink_style in 'DM':
                                        if self.article_permalink_style in 'DM':

-                                               article_view_args.update({'month': str(obj.date.month).zfill(2)})
+                                               kwargs.update({'month': str(obj.date.month).zfill(2)})

                                                if self.article_permalink_style == 'D':
                                                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)
+                                                       kwargs.update({'day': str(obj.date.day).zfill(2)})
+                               return reverse(self.article_view, urlconf=self, kwargs=kwargs)

                elif isinstance(obj, NewsletterIssue):
                        if obj.newsletter == self.newsletter:
                elif isinstance(obj, NewsletterIssue):
                        if obj.newsletter == self.newsletter:

-                               return reverse(self.issue_view, 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'))),
                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, 'articles_by_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('',
                )
                if self.issue_archive_page:
                        urlpatterns += patterns('',


@@ -361,9 +371,9 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        articles = articles.filter(date__day=day)
                return articles
        
                        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:
                try:

-                       issue = self.newsletter.issues.get(number=number)
+                       issue = self.newsletter.issues.get(numbering=numbering)

                except:
                        raise Http404
                context = extra_context or {}
                except:
                        raise Http404
                context = extra_context or {}


@@ -382,26 +392,11 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        article = articles.get(slug=slug)
                except:
                        raise Http404
                        article = articles.get(slug=slug)
                except:
                        raise Http404

-               context = {}
+               context = self.get_context()

                context.update(extra_context or {})
                context.update(extra_context or {})

-               context.update({'newsletter': self.newsletter, 'article': article})
+               context.update({'article': article})

                return self.article_page.render_to_response(node, request, extra_context=context)
        
                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_archive_view(self, request, node=None, extra_context=None):
                if not self.issue_archive_page:
                        raise Http404
        def issue_archive_view(self, request, node=None, extra_context=None):
                if not self.issue_archive_page:
                        raise Http404