From: Stephen Burrows Date: Mon, 27 Jun 2011 14:11:50 +0000 (-0400) Subject: Merge branch 'develop' into fast_containers X-Git-Tag: philo-0.9.1^2~5^2~8^2~3 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/1b86deeeaf9c98d994e95b983c44a82e004275b0?hp=2b9255e08e751c9653078a087b59f4d5169c34fe Merge branch 'develop' into fast_containers Conflicts: philo/templatetags/containers.py --- diff --git a/philo/contrib/penfield/models.py b/philo/contrib/penfield/models.py index 3a8e82f..9337589 100644 --- a/philo/contrib/penfield/models.py +++ b/philo/contrib/penfield/models.py @@ -144,7 +144,7 @@ class BlogView(FeedView): elif isinstance(obj, Tag) or (isinstance(obj, models.query.QuerySet) and obj.model == Tag and obj): if isinstance(obj, Tag): obj = [obj] - slugs = [tag.slug for tag in obj if tag in self.get_tag_queryset()] + slugs = [tag.slug for tag in obj if tag in self.get_tag_queryset(self.blog)] if slugs: return 'entries_by_tag', [], {'tag_slugs': "/".join(slugs)} elif isinstance(obj, (date, datetime)): @@ -199,23 +199,23 @@ class BlogView(FeedView): def get_context(self): return {'blog': self.blog} - def get_entry_queryset(self): + def get_entry_queryset(self, obj): """Returns the default :class:`QuerySet` of :class:`BlogEntry` instances for the :class:`BlogView` - all entries that are considered posted in the past. This allows for scheduled posting of entries.""" - return self.blog.entries.filter(date__lte=datetime.now()) + return obj.entries.filter(date__lte=datetime.now()) - def get_tag_queryset(self): + def get_tag_queryset(self, obj): """Returns the default :class:`QuerySet` of :class:`.Tag`\ s for the :class:`BlogView`'s :meth:`get_entries_by_tag` and :meth:`tag_archive_view`.""" - return self.blog.entry_tags + return obj.entry_tags - def get_all_entries(self, request, extra_context=None): + def get_all_entries(self, obj, request, extra_context=None): """Used to generate :meth:`~.FeedView.feed_patterns` for all entries.""" - return self.get_entry_queryset(), extra_context + return self.get_entry_queryset(obj), extra_context - def get_entries_by_ymd(self, request, year=None, month=None, day=None, extra_context=None): + def get_entries_by_ymd(self, obj, request, year=None, month=None, day=None, extra_context=None): """Used to generate :meth:`~.FeedView.feed_patterns` for entries with a specific year, month, and day.""" if not self.entry_archive_page: raise Http404 - entries = self.get_entry_queryset() + entries = self.get_entry_queryset(obj) if year: entries = entries.filter(date__year=year) if month: @@ -227,10 +227,10 @@ class BlogView(FeedView): context.update({'year': year, 'month': month, 'day': day}) return entries, context - def get_entries_by_tag(self, request, tag_slugs, extra_context=None): + def get_entries_by_tag(self, obj, request, tag_slugs, extra_context=None): """Used to generate :meth:`~.FeedView.feed_patterns` for entries with all of the given tags.""" tag_slugs = tag_slugs.replace('+', '/').split('/') - tags = self.get_tag_queryset().filter(slug__in=tag_slugs) + tags = self.get_tag_queryset(obj).filter(slug__in=tag_slugs) if not tags: raise Http404 @@ -241,7 +241,7 @@ class BlogView(FeedView): if slug and slug not in found_slugs: raise Http404 - entries = self.get_entry_queryset() + entries = self.get_entry_queryset(obj) for tag in tags: entries = entries.filter(tags=tag) @@ -252,7 +252,7 @@ class BlogView(FeedView): def entry_view(self, request, slug, year=None, month=None, day=None, extra_context=None): """Renders :attr:`entry_page` with the entry specified by the given parameters.""" - entries = self.get_entry_queryset() + entries = self.get_entry_queryset(self.blog) if year: entries = entries.filter(date__year=year) if month: @@ -275,7 +275,7 @@ class BlogView(FeedView): context = self.get_context() context.update(extra_context or {}) context.update({ - 'tags': self.get_tag_queryset() + 'tags': self.get_tag_queryset(self.blog) }) return self.tag_archive_page.render_to_response(request, extra_context=context) @@ -486,9 +486,7 @@ class NewsletterView(FeedView): url(r'^%s$' % self.issue_permalink_base, self.issue_archive_view, 'issue_archive') ) if self.article_archive_page: - urlpatterns += patterns('', - url(r'^%s' % self.article_permalink_base, include(self.feed_patterns('get_all_articles', 'article_archive_page', 'articles'))) - ) + urlpatterns += self.feed_patterns(r'^%s' % self.article_permalink_base, 'get_all_articles', 'article_archive_page', 'articles') if self.article_permalink_style in 'DMY': urlpatterns += self.feed_patterns(r'^%s/(?P\d{4})' % self.article_permalink_base, 'get_articles_by_ymd', 'article_archive_page', 'articles_by_year') if self.article_permalink_style in 'DM': @@ -518,40 +516,40 @@ class NewsletterView(FeedView): def get_context(self): return {'newsletter': self.newsletter} - def get_article_queryset(self): + def get_article_queryset(self, obj): """Returns the default :class:`QuerySet` of :class:`NewsletterArticle` instances for the :class:`NewsletterView` - all articles that are considered posted in the past. This allows for scheduled posting of articles.""" - return self.newsletter.articles.filter(date__lte=datetime.now()) + return obj.articles.filter(date__lte=datetime.now()) - def get_issue_queryset(self): + def get_issue_queryset(self, obj): """Returns the default :class:`QuerySet` of :class:`NewsletterIssue` instances for the :class:`NewsletterView`.""" - return self.newsletter.issues.all() + return obj.issues.all() - def get_all_articles(self, request, extra_context=None): + def get_all_articles(self, obj, request, extra_context=None): """Used to generate :meth:`~.FeedView.feed_patterns` for all entries.""" - return self.get_article_queryset(), extra_context + return self.get_article_queryset(obj), extra_context - def get_articles_by_ymd(self, request, year, month=None, day=None, extra_context=None): + def get_articles_by_ymd(self, obj, request, year, month=None, day=None, extra_context=None): """Used to generate :meth:`~.FeedView.feed_patterns` for a specific year, month, and day.""" - articles = self.get_article_queryset().filter(date__year=year) + articles = self.get_article_queryset(obj).filter(date__year=year) if month: articles = articles.filter(date__month=month) if day: articles = articles.filter(date__day=day) return articles, extra_context - def get_articles_by_issue(self, request, numbering, extra_context=None): + def get_articles_by_issue(self, obj, request, numbering, extra_context=None): """Used to generate :meth:`~.FeedView.feed_patterns` for articles from a certain issue.""" try: - issue = self.get_issue_queryset().get(numbering=numbering) + issue = self.get_issue_queryset(obj).get(numbering=numbering) except NewsletterIssue.DoesNotExist: raise Http404 context = extra_context or {} context.update({'issue': issue}) - return self.get_article_queryset().filter(issues=issue), context + return self.get_article_queryset(obj).filter(issues=issue), context def article_view(self, request, slug, year=None, month=None, day=None, extra_context=None): """Renders :attr:`article_page` with the article specified by the given parameters.""" - articles = self.get_article_queryset() + articles = self.get_article_queryset(self.newsletter) if year: articles = articles.filter(date__year=year) if month: @@ -574,7 +572,7 @@ class NewsletterView(FeedView): context = self.get_context() context.update(extra_context or {}) context.update({ - 'issues': self.get_issue_queryset() + 'issues': self.get_issue_queryset(self.newsletter) }) return self.issue_archive_page.render_to_response(request, extra_context=context) diff --git a/philo/contrib/winer/models.py b/philo/contrib/winer/models.py index 98d559e..09014eb 100644 --- a/philo/contrib/winer/models.py +++ b/philo/contrib/winer/models.py @@ -105,7 +105,7 @@ class FeedView(MultiView): """ Returns a view function that renders a list of items as a feed. - :param get_items_attr: A callable or the name of a callable on the :class:`FeedView` that will return a (items, extra_context) tuple when called with view arguments. + :param get_items_attr: A callable or the name of a callable on the :class:`FeedView` that will return a (items, extra_context) tuple when called with the object for the feed and view arguments. :param reverse_name: The name which can be used reverse the page for this feed using the :class:`FeedView` as the urlconf. :param feed_type: The slug used to render the feed class which will be used by the returned view function. @@ -117,7 +117,7 @@ class FeedView(MultiView): def inner(request, extra_context=None, *args, **kwargs): obj = self.get_object(request, *args, **kwargs) feed = self.get_feed(obj, request, reverse_name, feed_type, *args, **kwargs) - items, xxx = get_items(request, extra_context=extra_context, *args, **kwargs) + items, xxx = get_items(obj, request, extra_context=extra_context, *args, **kwargs) self.populate_feed(feed, items, request) response = HttpResponse(mimetype=feed.mime_type) @@ -138,7 +138,8 @@ class FeedView(MultiView): page = page_attr if isinstance(page_attr, Page) else getattr(self, page_attr) def inner(request, extra_context=None, *args, **kwargs): - items, extra_context = get_items(request, extra_context=extra_context, *args, **kwargs) + obj = self.get_object(request, *args, **kwargs) + items, extra_context = get_items(obj, request, extra_context=extra_context, *args, **kwargs) items, item_context = self.process_page_items(request, items) context = self.get_context() diff --git a/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py b/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py index b2e6a5e..75a3dee 100644 --- a/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py +++ b/philo/migrations/0018_auto__chg_field_node_view_object_id__chg_field_node_view_content_type.py @@ -74,7 +74,8 @@ class Migration(SchemaMigration): 'Meta': {'object_name': 'File'}, 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + 'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) }, 'philo.foreignkeyvalue': { 'Meta': {'object_name': 'ForeignKeyValue'}, @@ -94,7 +95,7 @@ class Migration(SchemaMigration): 'values': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['philo.ForeignKeyValue']", 'null': 'True', 'blank': 'True'}) }, 'philo.node': { - 'Meta': {'object_name': 'Node'}, + 'Meta': {'unique_together': "(('parent', 'slug'),)", 'object_name': 'Node'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), @@ -126,7 +127,7 @@ class Migration(SchemaMigration): 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}) }, 'philo.template': { - 'Meta': {'object_name': 'Template'}, + 'Meta': {'unique_together': "(('parent', 'slug'),)", 'object_name': 'Template'}, 'code': ('philo.models.fields.TemplateField', [], {}), 'documentation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), diff --git a/philo/templatetags/containers.py b/philo/templatetags/containers.py index 3370c78..2c55034 100644 --- a/philo/templatetags/containers.py +++ b/philo/templatetags/containers.py @@ -76,16 +76,6 @@ class ContainerNode(template.Node): content = '' else: content = contentlet.content - - if '{%' in content or '{{' in content: - try: - content = template.Template(contentlet.content, name=contentlet.name).render(context) - except template.TemplateSyntaxError, e: - if settings.DEBUG: - content = ('[Error parsing contentlet \'%s\': %s]' % (self.name, e)) - else: - content = settings.TEMPLATE_STRING_IF_INVALID - content = mark_safe(content) return content