Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #9303: comment templatetags no longer assume the built-in comme…

…nt model.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1aac357d344645f31320ee832b2c2e7be41c9ba0 1 parent 63d85a6
@jacobian jacobian authored
Showing with 10 additions and 1 deletion.
  1. +10 −1 django/contrib/comments/templatetags/comments.py
View
11 django/contrib/comments/templatetags/comments.py
@@ -3,6 +3,7 @@
from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.contrib import comments
+from django.db.models import FieldDoesNotExist
from django.utils.encoding import smart_unicode
register = template.Library()
@@ -82,7 +83,15 @@ def get_query_set(self, context):
site__pk = settings.SITE_ID,
is_public = True,
)
- if getattr(settings, 'COMMENTS_HIDE_REMOVED', True):
+
+ # The is_public and is_removed fields are implementation details of the
+ # built-in comment model's spam filtering system, so they might not
+ # be present on a custom comment model subclass. If they exist, we
+ # should filter on them.
+ field_names = [f.name for f in self.comment_model._meta.fields]
+ if 'is_public' in field_names:
+ qs = qs.filter(is_public=True)
+ if getattr(settings, 'COMMENTS_HIDE_REMOVED', True) and 'is_removed' in field_names:
qs = qs.filter(is_removed=False)
return qs
Please sign in to comment.
Something went wrong with that request. Please try again.