Merge branch 'node_absolute_urls' of git://github.com/melinath/philo

* 'node_absolute_urls' of git://github.com/melinath/philo:
  Implements get_absolute_url for nodes (Feature #17). Fixes that mysterious 'name' bug. ;-)

diff --git a/models/pages.py b/models/pages.py
index ed55ca5..7476f18 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -98,11 +98,17 @@ class Page(View):
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        
-       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+       def render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None):
                context = {}
                context.update(extra_context or {})
-               context.update({'node': node, 'page': self, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
-               return HttpResponse(self.template.django_template.render(RequestContext(request, context)), mimetype=self.template.mimetype)
+               context.update({'page': self, 'attributes': self.attributes, 'relationships': self.relationships})
+               if node and request:
+                       context.update({'node': node, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
+                       return self.template.django_template.render(RequestContext(request, context))
+               return self.template.django_template.render(Context(context))
+       
+       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+               return HttpResponse(self.render_to_string(node, request, path, subpath, extra_context), mimetype=self.template.mimetype)
        
        def __unicode__(self):
                return self.title

diff --git a/utils.py b/utils.py
index 11f9848..efd9f98 100644 (file)
--- a/utils.py
+++ b/utils.py
@@ -99,5 +99,7 @@ def paginate(objects, per_page=None, page_number=1):
                page = paginator.page(page_number)
        except EmptyPage:
                page = None
+       else:
+               objects = page.object_list
        
        return paginator, page, objects