X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/ea9fb8503810a21801969483337cc48ca9223bf2..6a9c8723936694a6b55f8b4bdcac7009c6c3cccf:/models.py?ds=inline

diff --git a/models.py b/models.py
index 878d3d4..d3bf5d4 100644
--- a/models.py
+++ b/models.py
@@ -10,7 +10,7 @@ from django.template import add_to_builtins as register_templatetags
 from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist
 from django.template import Context, RequestContext
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.exceptions import ObjectDoesNotExist
 try:
 	import json
 except ImportError:
@@ -157,6 +157,7 @@ class TreeManager(models.Manager):
 				return (obj, remainder)
 		raise self.model.DoesNotExist('%s matching query does not exist.' % self.model._meta.object_name)
 
+
 class TreeModel(models.Model):
 	objects = TreeManager()
 	parent = models.ForeignKey('self', related_name='children', null=True, blank=True)
@@ -166,7 +167,6 @@ class TreeModel(models.Model):
 		path = getattr(self, field, '?')
 		parent = self.parent
 		while parent:
-			self.validate_parent(parent)
 			path = getattr(parent, field, '?') + pathsep + path
 			parent = parent.parent
 		return path
@@ -177,30 +177,6 @@ class TreeModel(models.Model):
 	
 	class Meta:
 		abstract = True
-		
-	def validate_parents(self, parent=None):
-		if parent == None:
-			parent = self.parent
-		
-		while parent:
-			try:
-				self.validate_parent(parent)
-				parent = parent.parent
-			except ObjectDoesNotExist:
-				return # because it likely means the child doesn't exist 
-			
-	def validate_parent(self, parent):
-		#Why doesn't this stop the Admin site from saving a model with itself as parent?
-		if self == parent:
-			raise ValidationError("A %s can't be its own parent." % self.__class__.__name__)
-	
-	def clean(self):
-		super(TreeModel, self).clean()
-		self.validate_parents()
-	
-	def save(self, *args, **kwargs):
-		self.clean()
-		super(TreeModel, self).save(*args, **kwargs)
 
 
 class TreeEntity(TreeModel, Entity):
@@ -231,10 +207,6 @@ class InheritableTreeEntity(TreeEntity):
 	@property
 	def instance(self):
 		return self.instance_type.get_object_for_this_type(id=self.id)
-		
-	def validate_parent(self, parent):
-		if self.instance == parent.instance:
-			raise ValidationError("A %s can't be its own parent." % self.__class__.__name__)
 	
 	def get_path(self, pathsep='/', field='slug'):
 		path = getattr(self.instance, field, '?')