Django

Code

Changeset 5848

Show
Ignore:
Timestamp:
08/11/07 05:50:39 (1 year ago)
Author:
mtredinnick
Message:

Fixed #4189 -- Fixed crashes in a couple of corner cases in the comments app. Not a perfect fix (see ticket), but it will do as a holdover until the new comments framework is in place.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/AUTHORS

    r5847 r5848  
    132132    Joel Heenan <joelh-django@planetjoel.com> 
    133133    hipertracker@gmail.com 
     134    Brett Hoerner <bretthoerner@bretthoerner.com> 
    134135    Ian Holsman <http://feh.holsman.net/> 
    135136    Kieran Holland <http://www.kieranholland.com> 

  • django/trunk/django/contrib/comments/models.py

    r5803 r5848  
    107107 
    108108    def get_absolute_url(self): 
    109         return self.get_content_object().get_absolute_url() + "#c" + str(self.id) 
     109        try: 
     110            return self.get_content_object().get_absolute_url() + "#c" + str(self.id) 
     111        except AttributeError: 
     112            return "" 
    110113 
    111114    def get_crossdomain_url(self): 
    …… 
    192195 
    193196    def get_absolute_url(self): 
    194         return self.get_content_object().get_absolute_url() + "#c" + str(self.id) 
     197        try: 
     198            return self.get_content_object().get_absolute_url() + "#c" + str(self.id) 
     199        except AttributeError: 
     200            return "" 
    195201 
    196202    def get_content_object(self): 

  • django/trunk/django/contrib/comments/templatetags/comments.py

    r5715 r5848  
    113113        } 
    114114        kwargs.update(self.extra_kwargs) 
     115        comment_list = get_list_function(**kwargs).order_by(self.ordering + 'submit_date').select_related() 
    115116        if not self.free and settings.COMMENTS_BANNED_USERS_GROUP: 
    116             kwargs['select'] = {'is_hidden': 'user_id IN (SELECT user_id FROM auth_user_groups WHERE group_id = %s)' % settings.COMMENTS_BANNED_USERS_GROUP} 
    117         comment_list = get_list_function(**kwargs).order_by(self.ordering + 'submit_date').select_related() 
     117            comment_list = comment_list.extra(select={'is_hidden': 'user_id IN (SELECT user_id FROM auth_user_groups WHERE group_id = %s)' % settings.COMMENTS_BANNED_USERS_GROUP}) 
    118118 
    119119        if not self.free: 

  • django/trunk/django/contrib/comments/views/comments.py

    r5803 r5848  
    114114                {'count': settings.COMMENTS_FIRST_FEW, 'text': c.get_as_text()} 
    115115            mail_managers("Comment posted by rookie user", message) 
    116         if settings.COMMENTS_SKETCHY_USERS_GROUP and settings.COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.get_group_list()]: 
     116        if settings.COMMENTS_SKETCHY_USERS_GROUP and settings.COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.groups.all()]: 
    117117            message = _('This comment was posted by a sketchy user:\n\n%(text)s') % {'text': c.get_as_text()} 
    118118            mail_managers("Comment posted by sketchy user (%s)" % self.user_cache.username, c.get_as_text())