From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 19 Oct 2010 14:49:59 +0000 (-0400)
Subject: Added model validation to Pages; for a page to be valid, its related template must... 
X-Git-Tag: philo-0.9~29^2~4^2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/0133fd1af27b193ce3cb39073e67086561b787c3

Added model validation to Pages; for a page to be valid, its related template must also be valid. Ordinarily, the template would need to be valid in order to exist; however, this should help catch cases where, for example, changes on a filesystem template affect the validity of a database template. Addresses the remaining issues with bug #14.
---

diff --git a/models/pages.py b/models/pages.py
index 323aeb8..d6d4b10 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'