From: melinath <stephen.r.burrows@gmail.com>
Date: Wed, 18 Aug 2010 14:25:10 +0000 (-0400)
Subject: Moved templateform to forms.py in preparation for experimentation with page forms.
X-Git-Tag: philo-0.9~35^2~2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/6d5e8d5c70865b4e4181f411c66d1a9ec9c16ccd

Moved templateform to forms.py in preparation for experimentation with page forms.
---

diff --git a/admin/pages.py b/admin/pages.py
index ede4a0d..52238da 100644
--- a/admin/pages.py
+++ b/admin/pages.py
@@ -1,11 +1,11 @@
 from django.contrib import admin
 from django import forms
-from django.core.exceptions import ValidationError
-from django.template import Template as DjangoTemplate, loader, loader_tags, TemplateDoesNotExist, Context
+from django.template import Template as DjangoTemplate
 from philo.admin import widgets
 from philo.admin.base import COLLAPSE_CLASSES
 from philo.admin.nodes import ViewAdmin
 from philo.models.pages import Page, Template, Contentlet, ContentReference
+from philo.forms import TemplateForm
 
 
 class PageAdmin(ViewAdmin):
@@ -94,33 +94,6 @@ class PageAdmin(ViewAdmin):
 					contentreference.save()
 
 
-class TemplateForm(forms.ModelForm):
-	def clean_code(self):
-		code = self.cleaned_data['code']
-		try:
-			t = DjangoTemplate(code)
-		except Exception, e:
-			raise ValidationError("Template code invalid. Error was: %s: %s" % (e.__class__.__name__, e))
-		
-		# make sure all extended and included templates exist.
-		def validate_template(template):
-			for node in template.nodelist:
-				try:
-					if isinstance(node, loader_tags.ExtendsNode):
-						extended_template = node.get_parent(Context())
-						validate_template(extended_template)
-					elif isinstance(node, loader_tags.IncludeNode):
-						included_template = loader.get_template(node.template_name.resolve(Context()))
-						validate_template(extended_template)
-				except Exception, e:
-					raise ValidationError("Template code invalid. Error was: %s: %s" % (e.__class__.__name__, e))
-		validate_template(t)
-		return code
-	
-	class Meta:
-		model = Template
-
-
 class TemplateAdmin(admin.ModelAdmin):
 	prepopulated_fields = {'slug': ('name',)}
 	fieldsets = (
diff --git a/forms.py b/forms.py
index 907e54d..8050d39 100644
--- a/forms.py
+++ b/forms.py
@@ -1,6 +1,8 @@
+from django.core.exceptions import ValidationError
 from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm
+from django.template import loader, loader_tags, TemplateDoesNotExist, Context, Template as DjangoTemplate
 from django.utils.datastructures import SortedDict
-from philo.models import Entity
+from philo.models import Entity, Template
 from philo.models.fields import RelationshipField
 from philo.utils import fattr
 
@@ -86,4 +88,35 @@ class EntityForm(EntityFormBase): # Would inherit from ModelForm directly if it
 			instance.save()
 			self.save_m2m()
 		
-		return instance
\ No newline at end of file
+		return instance
+
+
+def validate_template(template):
+	"""
+	Makes sure that the template and all included or extended templates are valid.
+	"""	
+	for node in template.nodelist:
+		try:
+			if isinstance(node, loader_tags.ExtendsNode):
+				extended_template = node.get_parent(Context())
+				validate_template(extended_template)
+			elif isinstance(node, loader_tags.IncludeNode):
+				included_template = loader.get_template(node.template_name.resolve(Context()))
+				validate_template(extended_template)
+		except Exception, e:
+			raise ValidationError("Template code invalid. Error was: %s: %s" % (e.__class__.__name__, e))
+
+
+class TemplateForm(ModelForm):
+	def clean_code(self):
+		code = self.cleaned_data['code']
+		try:
+			t = DjangoTemplate(code)
+		except Exception, e:
+			raise ValidationError("Template code invalid. Error was: %s: %s" % (e.__class__.__name__, e))
+
+		validate_template(t)
+		return code
+
+	class Meta:
+		model = Template
\ No newline at end of file