X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/46fdca9049d4b7806bc4d6ec33973a3fc19153c4..9ccb8068a1e46fca83c7cc948cb66f17f5d570d2:/models/base.py

diff --git a/models/base.py b/models/base.py
index 291fe70..700b1e7 100644
--- a/models/base.py
+++ b/models/base.py
@@ -7,6 +7,28 @@ from philo.utils import ContentTypeRegistryLimiter
 from UserDict import DictMixin
 
 
+class Tag(models.Model):
+	name = models.CharField(max_length=250)
+	slug = models.SlugField(unique=True)
+	
+	def __unicode__(self):
+		return self.name
+	
+	class Meta:
+		app_label = 'philo'
+
+
+class Titled(models.Model):
+	title = models.CharField(max_length=255)
+	slug = models.SlugField()
+	
+	def __unicode__(self):
+		return self.title
+	
+	class Meta:
+		abstract = True
+
+
 class Attribute(models.Model):
 	entity_content_type = models.ForeignKey(ContentType, verbose_name='Entity type')
 	entity_object_id = models.PositiveIntegerField(verbose_name='Entity ID')
@@ -64,17 +86,19 @@ class QuerySetMapper(object, DictMixin):
 	def __init__(self, queryset, passthrough=None):
 		self.queryset = queryset
 		self.passthrough = passthrough
+	
 	def __getitem__(self, key):
 		try:
 			return self.queryset.get(key__exact=key).value
 		except ObjectDoesNotExist:
-			if self.passthrough:
+			if self.passthrough is not None:
 				return self.passthrough.__getitem__(key)
 			raise KeyError
+	
 	def keys(self):
 		keys = set(self.queryset.values_list('key', flat=True).distinct())
-		if self.passthrough:
-			keys += set(self.passthrough.keys())
+		if self.passthrough is not None:
+			keys |= set(self.passthrough.keys())
 		return list(keys)
 
 
@@ -92,7 +116,6 @@ class Entity(models.Model):
 	
 	class Meta:
 		abstract = True
-		app_label = 'philo'
 
 
 class TreeManager(models.Manager):
@@ -151,7 +174,6 @@ class TreeModel(models.Model):
 	class Meta:
 		unique_together = (('parent', 'slug'),)
 		abstract = True
-		app_label = 'philo'
 
 
 class TreeEntity(TreeModel, Entity):
@@ -168,5 +190,4 @@ class TreeEntity(TreeModel, Entity):
 		return super(TreeEntity, self).relationships
 	
 	class Meta:
-		abstract = True
-		app_label = 'philo'
\ No newline at end of file
+		abstract = True
\ No newline at end of file