Reduced number of queries for BlogView.get_entries_by_tag. Corrected waldo's AccountM...

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index 323aeb8..81b84c9 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -2,6 +2,7 @@
 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.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic

+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 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


@@ -20,14 +21,6 @@ class Template(TreeModel):
        mimetype = models.CharField(max_length=255, default=getattr(settings, 'DEFAULT_CONTENT_TYPE', 'text/html'))
        code = TemplateField(secure=False, 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):
-               return 'philo.models.Template: ' + self.path
-       
-       @property
-       def django_template(self):
-               return DjangoTemplate(self.code)
-       

        @property
        def containers(self):
                """
        @property
        def containers(self):
                """


@@ -40,7 +33,7 @@ class Template(TreeModel):
                        if isinstance(node, ContainerNode):
                                nodes.append(node)
                
                        if isinstance(node, ContainerNode):
                                nodes.append(node)
                

-               all_nodes = nodelist_crawl(self.django_template.nodelist, process_node)
+               all_nodes = nodelist_crawl(DjangoTemplate(self.code).nodelist, process_node)

                contentlet_node_names = set([node.name for node in all_nodes if not node.references])
                contentreference_node_names = []
                contentreference_node_specs = []
                contentlet_node_names = set([node.name for node in all_nodes if not node.references])
                contentreference_node_names = []
                contentreference_node_specs = []


@@ -53,15 +46,6 @@ class Template(TreeModel):
        def __unicode__(self):
                return self.get_path(pathsep=u' › ', field='name')
        
        def __unicode__(self):
                return self.get_path(pathsep=u' › ', field='name')
        

-       @staticmethod
-       @fattr(is_usable=True)
-       def loader(template_name, template_dirs=None): # load_template_source
-               try:
-                       template = Template.objects.get_with_path(template_name)
-               except Template.DoesNotExist:
-                       raise TemplateDoesNotExist(template_name)
-               return (template.code, template.origin)
-       

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


@@ -79,26 +63,45 @@ class Page(View):
                return self._containers
        containers = property(get_containers)
        
                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 = {}
                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)
-                       string = self.template.django_template.render(RequestContext(request, context))
+               context.update({'page': self, 'attributes': self.attributes})
+               template = DjangoTemplate(self.template.code)
+               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 = template.render(RequestContext(request, context))

                else:
                else:

-                       page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context)
-                       string = self.template.django_template.render(Context(context))
+                       page_about_to_render_to_string.send(sender=self, request=request, extra_context=context)
+                       string = template.render(Context(context))

                page_finished_rendering_to_string.send(sender=self, string=string)
                return string
        
                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 __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'
 
        class Meta:
                app_label = 'philo'