Removed referential integrity code. Moved embed templatetag into core. Differentiated...

[philo.git] / models / nodes.py

diff --git a/models/nodes.py b/models/nodes.py
index b633542..14f5063 100644 (file)
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -29,7 +29,7 @@ class Node(TreeEntity):
                return False
        
        def render_to_response(self, request, path=None, subpath=None, extra_context=None):
-               return self.view._render_to_response(self, request, path, subpath, extra_context)
+               return self.view.render_to_response(self, request, path, subpath, extra_context)
        
        def get_absolute_url(self):
                root = Site.objects.get_current().root_node
@@ -60,14 +60,14 @@ class View(Entity):
        def relationships_with_node(self, node):
                return QuerySetMapper(self.relationship_set, passthrough=node.relationships)
        
-       def _render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                extra_context = extra_context or {}
                view_about_to_render.send(sender=self, node=node, request=request, path=path, subpath=subpath, extra_context=extra_context)
-               response = self.render_to_response(node, request, path, subpath, extra_context)
+               response = self.actually_render_to_response(node, request, path, subpath, extra_context)
                view_finished_rendering.send(sender=self, response=response)
                return response
        
-       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+       def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                raise NotImplementedError('View subclasses must implement render_to_response.')
        
        class Meta:
@@ -82,7 +82,7 @@ class MultiView(View):
        
        urlpatterns = []
        
-       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+       def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                clear_url_caches()
                if not subpath:
                        subpath = ""
@@ -109,7 +109,7 @@ class Redirect(View):
        target = models.CharField(max_length=200, validators=[RedirectValidator()])
        status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type')
        
-       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+       def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                response = HttpResponseRedirect(self.target)
                response.status_code = self.status_code
                return response
@@ -124,7 +124,7 @@ class File(View):
        mimetype = models.CharField(max_length=255)
        file = models.FileField(upload_to='philo/files/%Y/%m/%d')
        
-       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+       def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                wrapper = FileWrapper(self.file)
                response = HttpResponse(wrapper, content_type=self.mimetype)
                response['Content-Length'] = self.file.size