From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 19 Oct 2010 14:56:15 +0000 (-0400)
Subject: Merge 'template_error_handling' bugfix.
X-Git-Tag: philo-0.9~29^2~4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/5aa5adcf276f2017c9747bc8214fb1e6ee8c82bc?hp=7d5025601fed0d03c7371ee4951cf6c41c9e3fa5

Merge 'template_error_handling' bugfix.
---

diff --git a/models/pages.py b/models/pages.py
index 16098d1..5e77afd 100644
--- 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.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
@@ -99,6 +100,24 @@ class Page(View):
 	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'