From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Mon, 9 Aug 2010 09:09:35 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~43
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/983293d923dcede8362ee17b27fc825b2a466096?hp=a66152cd03df94d103944255b836ed6ebed6ed15

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

* 'master' of git://github.com/melinath/philo:
  Added unique_together constraint to Attributes and Relationships.
  Added a bit to newsletters to streamline interactions with them.
---

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index c4cb49e..2a10e26 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -230,6 +230,7 @@ class NewsletterArticle(Entity, Titled):
 	full_text = models.TextField()
 	
 	class Meta:
+		get_latest_by = 'date'
 		ordering = ['-date']
 		unique_together = (('newsletter', 'slug'),)
 
@@ -240,7 +241,7 @@ register_value_model(NewsletterArticle)
 class NewsletterIssue(Entity, Titled):
 	newsletter = models.ForeignKey(Newsletter, related_name='issues')
 	number = models.PositiveIntegerField()
-	articles = models.ManyToManyField(NewsletterArticle)
+	articles = models.ManyToManyField(NewsletterArticle, related_name='issues')
 	
 	class Meta:
 		ordering = ['-number']
diff --git a/models/base.py b/models/base.py
index 81e557f..2a94daa 100644
--- a/models/base.py
+++ b/models/base.py
@@ -53,6 +53,7 @@ class Attribute(models.Model):
 	
 	class Meta:
 		app_label = 'philo'
+		unique_together = ('key', 'entity_content_type', 'entity_object_id')
 
 
 value_content_type_limiter = ContentTypeRegistryLimiter()
@@ -81,6 +82,7 @@ class Relationship(models.Model):
 	
 	class Meta:
 		app_label = 'philo'
+		unique_together = ('key', 'entity_content_type', 'entity_object_id')
 
 
 class QuerySetMapper(object, DictMixin):