X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3105e851ce4d7d426b3cffbd601c5b4e12075b41..4c276c601b86efbba0236eea2bda190bdff48af1:/models/pages.py

diff --git a/models/pages.py b/models/pages.py
index 45ffe64..323aeb8 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -1,44 +1,24 @@
 # encoding: utf-8
-from django.db import models
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
-from django.conf import settings
-from django.template import add_to_builtins as register_templatetags
-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
+from django.db import models
 from django.http import HttpResponse
+from django.template import TemplateDoesNotExist, Context, RequestContext, Template as DjangoTemplate, add_to_builtins as register_templatetags
 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.utils import fattr, nodelist_crawl
 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, default=getattr(settings, 'DEFAULT_CONTENT_TYPE', 'text/html'))
-	code = models.TextField(verbose_name='django template code')
+	code = TemplateField(secure=False, verbose_name='django template code')
 	
 	@property
 	def origin(self):
@@ -56,28 +36,11 @@ class Template(TreeModel):
 		This will break if there is a recursive extends or includes in the template code.
 		Due to the use of an empty Context, any extends or include tags with dynamic arguments probably won't work.
 		"""
-		def container_nodes(template):
-			def nodelist_container_nodes(nodelist):
-				nodes = []
-				for node in nodelist:
-					try:
-						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)))
-						
-						# _philo_additional_template is a property philo provides on all nodes that require it
-						# and which it monkeypatches onto the relevant default nodes.
-						if hasattr(node, LOADED_TEMPLATE_ATTR) and getattr(node, LOADED_TEMPLATE_ATTR):
-							nodes.extend(container_nodes(LOADED_TEMPLATE_ATTR))
-						
-						if isinstance(node, ContainerNode):
-							nodes.append(node)
-					except:
-						raise # fail for this node
-				return nodes
-			return nodelist_container_nodes(template.nodelist)
-		all_nodes = container_nodes(self.django_template)
+		def process_node(node, nodes):
+			if isinstance(node, ContainerNode):
+				nodes.append(node)
+		
+		all_nodes = nodelist_crawl(self.django_template.nodelist, process_node)
 		contentlet_node_names = set([node.name for node in all_nodes if not node.references])
 		contentreference_node_names = []
 		contentreference_node_specs = []
@@ -143,8 +106,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