From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 21 Oct 2010 20:22:11 +0000 (-0400)
Subject: Merge branch '404_relationship_bugfix' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~28
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/ace621afe8c9c2e835001bac819302cbdeb5e2df?hp=9592f8df376c7dacacd49bb7587ee494ad339035

Merge branch '404_relationship_bugfix' of git://github.com/melinath/philo

* '404_relationship_bugfix' of git://github.com/melinath/philo:
  Removes leftover references to relationships in nodeview error handling and in TreeEntity
---

diff --git a/models/base.py b/models/base.py
index 5d09f37..05074c3 100644
--- a/models/base.py
+++ b/models/base.py
@@ -340,11 +340,5 @@ class TreeEntity(Entity, TreeModel):
 			return QuerySetMapper(self.attribute_set, passthrough=self.parent.attributes)
 		return super(TreeEntity, self).attributes
 	
-	@property
-	def relationships(self):
-		if self.parent:
-			return QuerySetMapper(self.relationship_set, passthrough=self.parent.relationships)
-		return super(TreeEntity, self).relationships
-	
 	class Meta:
 		abstract = True
\ No newline at end of file
diff --git a/views.py b/views.py
index fd8e662..7aac917 100644
--- a/views.py
+++ b/views.py
@@ -27,7 +27,7 @@ def node_view(request, path=None, **kwargs):
 			raise
 		
 		try:
-			Http404View = node.relationships['Http404']
+			Http404View = node.attributes['Http404']
 		except KeyError:
 			Http404View = None
 		
@@ -42,7 +42,7 @@ def node_view(request, path=None, **kwargs):
 			raise
 		
 		try:
-			Http500View = node.relationships['Http500']
+			Http500View = node.attributes['Http500']
 			
 			if not Http500View:
 				raise e