X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3105e851ce4d7d426b3cffbd601c5b4e12075b41..01a66d144c3ac6539991c5b9f00e1bd5bab132ee:/models/pages.py diff --git a/models/pages.py b/models/pages.py index 45ffe64..fddb0ae 100644 --- a/models/pages.py +++ b/models/pages.py @@ -1,44 +1,25 @@ # 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.core.exceptions import ValidationError +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 +37,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 = [] @@ -116,26 +80,44 @@ class Page(View): return self._containers containers = property(get_containers) - def render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None): + def render_to_string(self, request=None, extra_context=None): context = {} context.update(extra_context or {}) - 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)}) - page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context) + context.update({'page': self, 'attributes': self.attributes}) + if request: + context.update({'node': request.node, 'attributes': self.attributes_with_node(request.node)}) + page_about_to_render_to_string.send(sender=self, request=request, extra_context=context) string = self.template.django_template.render(RequestContext(request, context)) else: - page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context) + page_about_to_render_to_string.send(sender=self, request=request, extra_context=context) string = self.template.django_template.render(Context(context)) page_finished_rendering_to_string.send(sender=self, string=string) return string - def actually_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 actually_render_to_response(self, request, extra_context=None): + return HttpResponse(self.render_to_string(request, extra_context), mimetype=self.template.mimetype) def __unicode__(self): return self.title + def clean_fields(self, exclude=None): + try: + super(Page, self).clean_fields(exclude) + except ValidationError, e: + errors = e.message_dict + else: + errors = {} + + if 'template' not in errors and 'template' not in exclude: + try: + self.template.clean_fields() + self.template.clean() + except ValidationError, e: + errors['template'] = e.messages + + if errors: + raise ValidationError(errors) + class Meta: app_label = 'philo' @@ -143,8 +125,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