Adding __unicode__ to BlogViews.

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index 2ba56d0..5f75494 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -11,7 +11,7 @@ from django.template.loader import get_template
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.http import HttpResponse
 from philo.models.base import TreeModel, register_value_model
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.http import HttpResponse
 from philo.models.base import TreeModel, register_value_model

-from philo.models.nodes import Node
+from philo.models.nodes import View

 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode
 
 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode
 


@@ -43,9 +43,10 @@ class Template(TreeModel):
                                nodes = []
                                for node in nodelist:
                                        try:
                                nodes = []
                                for node in nodelist:
                                        try:

-                                               for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'):
-                                                       if hasattr(node, nodelist_name):
-                                                               nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
+                                               if hasattr(node, 'child_nodelists'):
+                                                       for nodelist_name in node.child_nodelists:
+                                                               if hasattr(node, nodelist_name):
+                                                                       nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))

                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)
                                                elif isinstance(node, ExtendsNode):
                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)
                                                elif isinstance(node, ExtendsNode):


@@ -90,18 +91,21 @@ class Template(TreeModel):
                app_label = 'philo'
 
 
                app_label = 'philo'
 
 

-class Page(Node):
+class Page(View):

        """
        Represents a page - something which is rendered according to a template. The page will have a number of related Contentlets depending on the template selected - but these will appear only after the page has been saved with that template.
        """
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        
        """
        Represents a page - something which is rendered according to a template. The page will have a number of related Contentlets depending on the template selected - but these will appear only after the page has been saved with that template.
        """
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        

-       def render_to_response(self, request, path=None, subpath=None):
-               return HttpResponse(self.template.django_template.render(RequestContext(request, {'page': self})), mimetype=self.template.mimetype)
+       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+               context = {}
+               context.update(extra_context or {})
+               context.update({'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)

        
        def __unicode__(self):
        
        def __unicode__(self):

-               return self.get_path(u' › ', 'title')
+               return self.title

        
        class Meta:
                app_label = 'philo'
        
        class Meta:
                app_label = 'philo'