Ticket #11870: 11870_2.diff

File 11870_2.diff, 2.1 KB (added by thejaswi_puthraya, 6 years ago)

git patch against the latest checkout

  • django/contrib/comments/__init__.py

    diff --git a/django/contrib/comments/__init__.py b/django/contrib/comments/__init__.py
    index 42384e7..4d32af0 100644
    a b  
    11from django.conf import settings
    22from django.core import urlresolvers
    33from django.core.exceptions import ImproperlyConfigured
    4 from django.contrib.comments.models import Comment
    5 from django.contrib.comments.forms import CommentForm
    64from django.utils.importlib import import_module
    75
    86DEFAULT_COMMENTS_APP = 'django.contrib.comments'
    def get_model(): 
    4038    if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_model"):
    4139        return get_comment_app().get_model()
    4240    else:
     41        from django.contrib.comments.models import Comment
    4342        return Comment
    4443
    4544def get_form():
    def get_form(): 
    4948    if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form"):
    5049        return get_comment_app().get_form()
    5150    else:
     51        from django.contrib.comments.forms import CommentForm
    5252        return CommentForm
    5353
    5454def get_form_target():
  • django/contrib/comments/models.py

    diff --git a/django/contrib/comments/models.py b/django/contrib/comments/models.py
    index 5e128d2..2c5dff4 100644
    a b from django.db import models 
    88from django.core import urlresolvers
    99from django.utils.translation import ugettext_lazy as _
    1010from django.conf import settings
     11from django.contrib.comments import get_model
    1112
    1213COMMENT_MAX_LENGTH = getattr(settings,'COMMENT_MAX_LENGTH',3000)
    1314
    class CommentFlag(models.Model): 
    166167    if you want rating look elsewhere.
    167168    """
    168169    user      = models.ForeignKey(User, verbose_name=_('user'), related_name="comment_flags")
    169     comment   = models.ForeignKey(Comment, verbose_name=_('comment'), related_name="flags")
     170    comment   = models.ForeignKey(get_model(), verbose_name=_('comment'), related_name="flags")
    170171    flag      = models.CharField(_('flag'), max_length=30, db_index=True)
    171172    flag_date = models.DateTimeField(_('date'), default=None)
    172173
Back to Top