X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/1d21b0f7b336f5761e570023d64d413748b07cc1..730e805b0bc60c7b771a9c47caf055fa16f8095e:/philo/contrib/penfield/models.py diff --git a/philo/contrib/penfield/models.py b/philo/contrib/penfield/models.py index 7a3eaa8..bcd0ba4 100644 --- a/philo/contrib/penfield/models.py +++ b/philo/contrib/penfield/models.py @@ -51,9 +51,9 @@ class FeedView(MultiView): #: A :class:`PositiveIntegerField` - the maximum number of items to return for this feed. All items will be returned if this field is blank. Default: 15. feed_length = models.PositiveIntegerField(blank=True, null=True, default=15, help_text="The maximum number of items to return for this feed. All items will be returned if this field is blank.") - #: A :class:`ForeignKey` to a :class:`.Template` which can be used to render the title of each item in the feed. + #: A :class:`ForeignKey` to a :class:`.Template` which will be used to render the title of each item in the feed if provided. item_title_template = models.ForeignKey(Template, blank=True, null=True, related_name="%(app_label)s_%(class)s_title_related") - #: A :class:`ForeignKey` to a :class:`.Template` which can be used to render the description of each item in the feed. + #: A :class:`ForeignKey` to a :class:`.Template` which will be used to render the description of each item in the feed if provided. item_description_template = models.ForeignKey(Template, blank=True, null=True, related_name="%(app_label)s_%(class)s_description_related") #: The name of the context variable to be populated with the items managed by the :class:`FeedView`. @@ -471,7 +471,7 @@ class BlogView(FeedView): @property def urlpatterns(self): urlpatterns = self.feed_patterns(r'^', 'get_all_entries', 'index_page', 'index') +\ - self.feed_patterns(r'^%s/(?P[-\w]+[-+/\w]*)$' % self.tag_permalink_base, 'get_entries_by_tag', 'tag_page', 'entries_by_tag') + self.feed_patterns(r'^%s/(?P[-\w]+[-+/\w]*)' % self.tag_permalink_base, 'get_entries_by_tag', 'tag_page', 'entries_by_tag') if self.tag_archive_page: urlpatterns += patterns('',