Ticket #1637: comments.diff

File comments.diff, 8.4 KB (added by Dave St.Germain <dcs@…>, 9 years ago)

patch for other comments files

  • templatetags/comments.py

     
    22from django.contrib.comments.models import PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC
    33from django.contrib.comments.models import MIN_PHOTO_DIMENSION, MAX_PHOTO_DIMENSION
    44from django import template
    5 from django.core.template import loader
     5from django.template import loader
    66from django.core.exceptions import ObjectDoesNotExist
    77from django.contrib.contenttypes.models import ContentType
    88import re
     
    7777
    7878    def render(self, context):
    7979        from django.conf import settings
    80         get_count_function = self.free and FreeComment.objects.get_count or Comment.objects.get_count
     80        manager = self.free and FreeComment.objects or Comment.objects
    8181        if self.context_var_name is not None:
    8282            self.obj_id = template.resolve_variable(self.context_var_name, context)
    83         comment_count = get_count_function(object_id__exact=self.obj_id,
    84             content_type__package__label__exact=self.package,
    85             content_type__python_module_name__exact=self.module, site__id__exact=settings.SITE_ID)
     83        comment_count = manager.filter(object_id__exact=self.obj_id,
     84            content_type__app_label__exact=self.package,
     85            content_type__model__exact=self.module, site__id__exact=settings.SITE_ID).count()
    8686        context[self.var_name] = comment_count
    8787        return ''
    8888
     
    9696
    9797    def render(self, context):
    9898        from django.conf import settings
    99         get_list_function = self.free and FreeComment.objects.get_list or Comment.objects.get_list_with_karma
     99        get_list_function = self.free and FreeComment.objects.filter or Comment.objects.get_list_with_karma
    100100        if self.context_var_name is not None:
    101101            try:
    102102                self.obj_id = template.resolve_variable(self.context_var_name, context)
     
    104104                return ''
    105105        kwargs = {
    106106            'object_id__exact': self.obj_id,
    107             'content_type__package__label__exact': self.package,
    108             'content_type__python_module_name__exact': self.module,
     107            'content_type__app_label__exact': self.package,
     108            'content_type__model__exact': self.module,
    109109            'site__id__exact': settings.SITE_ID,
    110             'select_related': True,
    111             'order_by': (self.ordering + 'submit_date',),
    112110        }
    113111        kwargs.update(self.extra_kwargs)
    114112        if not self.free and settings.COMMENTS_BANNED_USERS_GROUP:
    115113            kwargs['select'] = {'is_hidden': 'user_id IN (SELECT user_id FROM auth_users_groups WHERE group_id = %s)' % settings.COMMENTS_BANNED_USERS_GROUP}
    116         comment_list = get_list_function(**kwargs)
     114        comment_list = get_list_function(**kwargs).order_by(self.ordering + 'submit_date').select_related()
    117115
    118116        if not self.free:
    119117            if context.has_key('user') and not context['user'].is_anonymous():
     
    157155        except ValueError: # unpack list of wrong size
    158156            raise template.TemplateSyntaxError, "Third argument in %r tag must be in the format 'package.module'" % tokens[0]
    159157        try:
    160             content_type = ContentType.objects.get_object(package__label__exact=package, python_module_name__exact=module)
     158            content_type = ContentType.objects.get(app_label__exact=package, model__exact=module)
    161159        except ContentType.DoesNotExist:
    162160            raise template.TemplateSyntaxError, "%r tag has invalid content-type '%s.%s'" % (tokens[0], package, module)
    163161        obj_id_lookup_var, obj_id = None, None
     
    237235        except ValueError: # unpack list of wrong size
    238236            raise template.TemplateSyntaxError, "Third argument in %r tag must be in the format 'package.module'" % tokens[0]
    239237        try:
    240             content_type = ContentType.objects.get_object(package__label__exact=package, python_module_name__exact=module)
     238            content_type = ContentType.objects.get(app_label__exact=package, model__exact=module)
    241239        except ContentType.DoesNotExist:
    242240            raise template.TemplateSyntaxError, "%r tag has invalid content-type '%s.%s'" % (tokens[0], package, module)
    243241        var_name, obj_id = None, None
     
    292290        except ValueError: # unpack list of wrong size
    293291            raise template.TemplateSyntaxError, "Third argument in %r tag must be in the format 'package.module'" % tokens[0]
    294292        try:
    295             content_type = ContentType.objects.get_object(package__label__exact=package, python_module_name__exact=module)
     293            content_type = ContentType.objects.get(app_label__exact=package,model__exact=module)
    296294        except ContentType.DoesNotExist:
    297295            raise template.TemplateSyntaxError, "%r tag has invalid content-type '%s.%s'" % (tokens[0], package, module)
    298296        var_name, obj_id = None, None
  • models.py

     
    5050        kwargs.setdefault('select', {})
    5151        kwargs['select']['_karma_total_good'] = 'SELECT COUNT(*) FROM comments_karma WHERE comments_karma.comment_id=comments.id AND score=1'
    5252        kwargs['select']['_karma_total_bad'] = 'SELECT COUNT(*) FROM comments_karma WHERE comments_karma.comment_id=comments.id AND score=-1'
    53         return self.get_list(**kwargs)
     53        return self.filter(**kwargs)
    5454
    5555    def user_is_moderator(self, user):
    5656        if user.is_superuser:
  • views/comments.py

     
    9090    def save(self, new_data):
    9191        today = datetime.date.today()
    9292        c = self.get_comment(new_data)
    93         for old in Comment.objects.get_list(content_type__id__exact=new_data["content_type_id"],
     93        for old in Comment.objects.filter(content_type__id__exact=new_data["content_type_id"],
    9494            object_id__exact=new_data["object_id"], user__id__exact=self.get_user_id()):
    9595            # Check that this comment isn't duplicate. (Sometimes people post
    9696            # comments twice by mistake.) If it is, fail silently by pretending
     
    146146        # Check that this comment isn't duplicate. (Sometimes people post
    147147        # comments twice by mistake.) If it is, fail silently by pretending
    148148        # the comment was posted successfully.
    149         for old_comment in FreeComment.objects.get_list(content_type__id__exact=new_data["content_type_id"],
     149        for old_comment in FreeComment.objects.filter(content_type__id__exact=new_data["content_type_id"],
    150150            object_id__exact=new_data["object_id"], person_name__exact=new_data["person_name"],
    151151            submit_date__year=today.year, submit_date__month=today.month,
    152152            submit_date__day=today.day):
     
    202202        rating_range, rating_choices = [], []
    203203    content_type_id, object_id = target.split(':') # target is something like '52:5157'
    204204    try:
    205         obj = ContentType.objects.get_object(pk=content_type_id).get_object_for_this_type(pk=object_id)
     205        obj = ContentType.objects.get(pk=content_type_id).get_object_for_this_type(pk=object_id)
    206206    except ObjectDoesNotExist:
    207207        raise Http404, _("The comment form had an invalid 'target' parameter -- the object ID was invalid")
    208208    option_list = options.split(',') # options is something like 'pa,ra'
     
    285285    if Comment.objects.get_security_hash(options, '', '', target) != security_hash:
    286286        raise Http404, _("Somebody tampered with the comment form (security violation)")
    287287    content_type_id, object_id = target.split(':') # target is something like '52:5157'
    288     content_type = ContentType.objects.get_object(pk=content_type_id)
     288    content_type = ContentType.objects.get(pk=content_type_id)
    289289    try:
    290290        obj = content_type.get_object_for_this_type(pk=object_id)
    291291    except ObjectDoesNotExist:
     
    333333    if request.GET.has_key('c'):
    334334        content_type_id, object_id = request.GET['c'].split(':')
    335335        try:
    336             content_type = ContentType.objects.get_object(pk=content_type_id)
     336            content_type = ContentType.objects.get(pk=content_type_id)
    337337            obj = content_type.get_object_for_this_type(pk=object_id)
    338338        except ObjectDoesNotExist:
    339339            pass
Back to Top