Moved a few more miscellaneous things into master from embed that did not belong...

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index 7b4415d..daeb621 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -8,20 +8,38 @@ from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist
 from django.template import Context, RequestContext
 from django.template.loader import get_template
-from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
+from django.template.loader_tags import ExtendsNode, ConstantIncludeNode
 from django.http import HttpResponse
 from philo.models.base import TreeModel, register_value_model
+from philo.models.fields import TemplateField
 from philo.models.nodes import View
 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode
+from philo.validators import LOADED_TEMPLATE_ATTR
 from philo.signals import page_about_to_render_to_string, page_finished_rendering_to_string
 
 
+BLANK_CONTEXT = Context()
+
+
+def get_extended(self):
+       return self.get_parent(BLANK_CONTEXT)
+
+
+def get_included(self):
+       return self.template
+
+
+# We ignore the IncludeNode because it will never work in a blank context.
+setattr(ExtendsNode, LOADED_TEMPLATE_ATTR, property(get_extended))
+setattr(ConstantIncludeNode, LOADED_TEMPLATE_ATTR, property(get_included))
+
+
 class Template(TreeModel):
        name = models.CharField(max_length=255)
        documentation = models.TextField(null=True, blank=True)
-       mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
-       code = models.TextField(verbose_name='django template code')
+       mimetype = models.CharField(max_length=255, default=getattr(settings, 'DEFAULT_CONTENT_TYPE', 'text/html'))
+       code = TemplateField(secure=False, verbose_name='django template code')
        
        @property
        def origin(self):
@@ -48,20 +66,17 @@ class Template(TreeModel):
                                                        for nodelist_name in node.child_nodelists:
                                                                if hasattr(node, nodelist_name):
                                                                        nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
+                                               
+                                               # LOADED_TEMPLATE_ATTR contains the name of an attribute philo uses to declare a
+                                               # node as rendering an additional template. Philo monkeypatches the attribute onto
+                                               # the relevant default nodes.
+                                               if hasattr(node, LOADED_TEMPLATE_ATTR):
+                                                       loaded_template = getattr(node, LOADED_TEMPLATE_ATTR)
+                                                       if loaded_template:
+                                                               nodes.extend(container_nodes(loaded_template))
+                                               
                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)
-                                               elif isinstance(node, ExtendsNode):
-                                                       extended_template = node.get_parent(Context())
-                                                       if extended_template:
-                                                               nodes.extend(container_nodes(extended_template))
-                                               elif isinstance(node, ConstantIncludeNode):
-                                                       included_template = node.template
-                                                       if included_template:
-                                                               nodes.extend(container_nodes(included_template))
-                                               elif isinstance(node, IncludeNode):
-                                                       included_template = get_template(node.template_name.resolve(Context()))
-                                                       if included_template:
-                                                               nodes.extend(container_nodes(included_template))
                                        except:
                                                raise # fail for this node
                                return nodes
@@ -132,8 +147,7 @@ class Page(View):
 class Contentlet(models.Model):
        page = models.ForeignKey(Page, related_name='contentlets')
        name = models.CharField(max_length=255)
-       content = models.TextField()
-       dynamic = models.BooleanField(default=False)
+       content = TemplateField()
        
        def __unicode__(self):
                return self.name