Mercurial > public > sg101
diff gpp/forums/models.py @ 386:9fcd366f22dc
Revert r323. Send out forum topic subscription emails as people post. Don't limit them.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Thu, 17 Mar 2011 01:20:23 +0000 |
| parents | ee451ad46af1 |
| children | b15726767ab8 |
line wrap: on
line diff
--- a/gpp/forums/models.py Wed Mar 16 02:13:38 2011 +0000 +++ b/gpp/forums/models.py Thu Mar 17 01:20:23 2011 +0000 @@ -183,7 +183,7 @@ sticky = models.BooleanField(blank=True, default=False) locked = models.BooleanField(blank=True, default=False) subscribers = models.ManyToManyField(User, related_name='subscriptions', - verbose_name='subscribers', blank=True, through='Subscription') + verbose_name='subscribers', blank=True) bookmarkers = models.ManyToManyField(User, related_name='favorite_topics', verbose_name='bookmarkers', blank=True) @@ -392,12 +392,3 @@ def __unicode__(self): return u'Post %d, %s' % (self.post.pk, self.embed.title) - -class Subscription(models.Model): - """ - This model is a "through" table for the M2M relationshiop between forum - topics and users (subscribers). - """ - topic = models.ForeignKey(Topic) - user = models.ForeignKey(User) - notify_date = models.DateTimeField(null=True)