X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/1dba84d30c4323acb722de2011ff7a0bff9148aa..c11e2882169bdc06828c782e65bde3f13a03d044:/models/pages.py?ds=sidebyside

diff --git a/models/pages.py b/models/pages.py
index fddb0ae..ef68b5f 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -21,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')
 	
-	@property
-	def origin(self):
-		return 'philo.models.Template: ' + self.path
-	
-	@property
-	def django_template(self):
-		return DjangoTemplate(self.code)
-	
 	@property
 	def containers(self):
 		"""
@@ -41,7 +33,7 @@ class Template(TreeModel):
 			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 = []
@@ -54,15 +46,6 @@ class Template(TreeModel):
 	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'
 
@@ -84,13 +67,14 @@ class Page(View):
 		context = {}
 		context.update(extra_context or {})
 		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 = self.template.django_template.render(RequestContext(request, context))
+			string = template.render(RequestContext(request, context))
 		else:
 			page_about_to_render_to_string.send(sender=self, request=request, extra_context=context)
-		 	string = self.template.django_template.render(Context(context))
+		 	string = template.render(Context(context))
 		page_finished_rendering_to_string.send(sender=self, string=string)
 		return string
 	
@@ -124,7 +108,7 @@ class Page(View):
 
 class Contentlet(models.Model):
 	page = models.ForeignKey(Page, related_name='contentlets')
-	name = models.CharField(max_length=255)
+	name = models.CharField(max_length=255, db_index=True)
 	content = TemplateField()
 	
 	def __unicode__(self):
@@ -136,7 +120,7 @@ class Contentlet(models.Model):
 
 class ContentReference(models.Model):
 	page = models.ForeignKey(Page, related_name='contentreferences')
-	name = models.CharField(max_length=255)
+	name = models.CharField(max_length=255, db_index=True)
 	content_type = models.ForeignKey(ContentType, verbose_name='Content type')
 	content_id = models.PositiveIntegerField(verbose_name='Content ID', blank=True, null=True)
 	content = generic.GenericForeignKey('content_type', 'content_id')