summaryrefslogtreecommitdiff
path: root/app/lib/django_comments/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'app/lib/django_comments/models.py')
-rw-r--r--app/lib/django_comments/models.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/lib/django_comments/models.py b/app/lib/django_comments/models.py
index 08bad3c..78ce8b8 100644
--- a/app/lib/django_comments/models.py
+++ b/app/lib/django_comments/models.py
@@ -1,5 +1,5 @@
from django.conf import settings
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.contrib.sites.models import Site
from django.core import urlresolvers
@@ -24,7 +24,7 @@ class BaseCommentAbstractModel(models.Model):
verbose_name=_('content type'),
related_name="content_type_set_for_%(class)s")
object_pk = models.TextField(_('object ID'))
- content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_pk")
+ content_object = GenericForeignKey(ct_field="content_type", fk_field="object_pk")
# Metadata about the comment
site = models.ForeignKey(Site)
@@ -79,6 +79,7 @@ class Comment(BaseCommentAbstractModel):
permissions = [("can_moderate", "Can moderate comments")]
verbose_name = _('comment')
verbose_name_plural = _('comments')
+ app_label = _('comment')
def __str__(self):
return "%s: %s..." % (self.name, self.comment[:50])
@@ -190,6 +191,7 @@ class CommentFlag(models.Model):
unique_together = [('user', 'comment', 'flag')]
verbose_name = _('comment flag')
verbose_name_plural = _('comment flags')
+ app_label = _('commentflag')
def __str__(self):
return "%s flag of comment ID %s by %s" % \