From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Fri, 1 Oct 2010 14:49:55 +0000 (-0400)
Subject: Moved a few more miscellaneous things into master from embed that did not belong... 
X-Git-Tag: philo-0.9~30^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/7ec22cc295e564d14bc47deaca98937d494546a9

Moved a few more miscellaneous things into master from embed that did not belong there, mostly deletions of old code regarding template validation.
---

diff --git a/admin/pages.py b/admin/pages.py
index 03b943f..4810e0f 100644
--- a/admin/pages.py
+++ b/admin/pages.py
@@ -1,11 +1,10 @@
 from django.contrib import admin
 from django import forms
-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, ContentletInlineFormSet, ContentReferenceInlineFormSet, ContentletForm, ContentReferenceForm
+from philo.forms import ContentletInlineFormSet, ContentReferenceInlineFormSet, ContentletForm, ContentReferenceForm
 
 
 class ContentletInline(admin.StackedInline):
@@ -62,7 +61,6 @@ class TemplateAdmin(admin.ModelAdmin):
 	save_on_top = True
 	save_as = True
 	list_display = ('__unicode__', 'slug', 'get_path',)
-	form = TemplateForm
 
 
 admin.site.register(Page, PageAdmin)
diff --git a/forms.py b/forms.py
index 3c6ed1a..ced29b2 100644
--- a/forms.py
+++ b/forms.py
@@ -96,37 +96,6 @@ class EntityForm(EntityFormBase): # Would inherit from ModelForm directly if it
 		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
-
-
 class ContainerForm(ModelForm):
 	def __init__(self, *args, **kwargs):
 		super(ContainerForm, self).__init__(*args, **kwargs)
@@ -134,7 +103,7 @@ class ContainerForm(ModelForm):
 
 
 class ContentletForm(ContainerForm):
-	content = forms.CharField(required=False, widget=AdminTextareaWidget)
+	content = forms.CharField(required=False, widget=AdminTextareaWidget, label='Content')
 	
 	def should_delete(self):
 		return not bool(self.cleaned_data['content'])
@@ -163,8 +132,8 @@ class ContentReferenceForm(ContainerForm):
 
 class ContainerInlineFormSet(BaseInlineFormSet):
 	def __init__(self, containers, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None):
-		# Unfortunately, I need to add some things to BaseInline between its __init__ and its super call, so
-		# a lot of this is repetition.
+		# Unfortunately, I need to add some things to BaseInline between its __init__ and its
+		# super call, so a lot of this is repetition.
 		
 		# Start cribbed from BaseInline
 		from django.db.models.fields.related import RelatedObject