From 6ffd4786c51fe4fdf03269360ba3eb79d738b112 Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Thu, 21 Jul 2011 14:27:16 -0400 Subject: [PATCH] Removed Node.render_to_response select_related call since it is not clearly more efficient. Delayed page evaluation in FeedView.page_view to the end of the inner function. --- philo/contrib/winer/models.py | 2 +- philo/models/nodes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/philo/contrib/winer/models.py b/philo/contrib/winer/models.py index 09014eb..4acf5d1 100644 --- a/philo/contrib/winer/models.py +++ b/philo/contrib/winer/models.py @@ -135,7 +135,6 @@ class FeedView(MultiView): """ get_items = get_items_attr if callable(get_items_attr) else getattr(self, get_items_attr) - page = page_attr if isinstance(page_attr, Page) else getattr(self, page_attr) def inner(request, extra_context=None, *args, **kwargs): obj = self.get_object(request, *args, **kwargs) @@ -146,6 +145,7 @@ class FeedView(MultiView): context.update(extra_context or {}) context.update(item_context or {}) + page = page_attr if isinstance(page_attr, Page) else getattr(self, page_attr) return page.render_to_response(request, extra_context=context) return inner diff --git a/philo/models/nodes.py b/philo/models/nodes.py index 58d1b96..647ba81 100644 --- a/philo/models/nodes.py +++ b/philo/models/nodes.py @@ -55,7 +55,7 @@ class Node(SlugTreeEntity): """This is a shortcut method for :meth:`View.render_to_response`""" if self.view_object_id and self.view_content_type_id: view_model = ContentType.objects.get_for_id(self.view_content_type_id).model_class() - self.view = view_model._default_manager.select_related(depth=1).get(pk=self.view_object_id) + self.view = view_model._default_manager.get(pk=self.view_object_id) return self.view.render_to_response(request, extra_context) raise Http404 -- 2.20.1