diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-03-14 18:27:57 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-03-14 18:27:57 -0400 |
commit | 10c98242325230d2314c2f1292e75650acd8d50e (patch) | |
tree | b977974539f794324a4bb36655ae6e35ecc769a3 /forum/models/base.py | |
parent | 7d4e81c2e6553ee9aa087d95fdc6c87f75b021df (diff) | |
parent | c2255c60fa5bca3f49fa30aa81a20fcdaa603dc3 (diff) | |
download | askbot-10c98242325230d2314c2f1292e75650acd8d50e.tar.gz askbot-10c98242325230d2314c2f1292e75650acd8d50e.tar.bz2 askbot-10c98242325230d2314c2f1292e75650acd8d50e.zip |
merged with master branch
Diffstat (limited to 'forum/models/base.py')
-rwxr-xr-x | forum/models/base.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/forum/models/base.py b/forum/models/base.py index 56cb95be..fb66ff1b 100755 --- a/forum/models/base.py +++ b/forum/models/base.py @@ -17,11 +17,15 @@ import django.dispatch from django.conf import settings import logging -if settings.USE_SPHINX_SEARCH == True: - from djangosphinx.models import SphinxSearch - from forum.const import * +class UserContent(models.Model): + user = models.ForeignKey(User, related_name='%(class)ss') + + class Meta: + abstract = True + app_label = 'forum' + class MetaContent(models.Model): """ Base class for Vote, Comment and FlaggedItem @@ -29,7 +33,6 @@ class MetaContent(models.Model): content_type = models.ForeignKey(ContentType) object_id = models.PositiveIntegerField() content_object = generic.GenericForeignKey('content_type', 'object_id') - user = models.ForeignKey(User, related_name='%(class)ss') class Meta: abstract = True |