equal
deleted
inserted
replaced
302 if DECORATED_CREATORS: |
302 if DECORATED_CREATORS: |
303 names = list(allowed_comments.filter(user__isnull=False).values('name').annotate(nb_comments=Count('id'))) #.order_by('name')) |
303 names = list(allowed_comments.filter(user__isnull=False).values('name').annotate(nb_comments=Count('id'))) #.order_by('name')) |
304 author = text_version.name |
304 author = text_version.name |
305 else: |
305 else: |
306 names += list(User.objects.filter(Q(comment__text_version=text_version),Q(comment__deleted=False), Q(comment__id__in=allowed_ids)).extra(select={'name': "username"}).values('name').annotate(nb_comments=Count('id'))) #.order_by('username')) |
306 names += list(User.objects.filter(Q(comment__text_version=text_version),Q(comment__deleted=False), Q(comment__id__in=allowed_ids)).extra(select={'name': "username"}).values('name').annotate(nb_comments=Count('id'))) #.order_by('username')) |
307 author = User.objects.filter(id=text_version.user_id).values('username')[0]['username'] |
307 has_author = User.objects.filter(id=text_version.user_id).values('username') |
|
308 if has_author: |
|
309 author = has_author[0]['username'] |
|
310 else: |
|
311 author = '' |
308 if request.GET.get('name', None): |
312 if request.GET.get('name', None): |
309 me = request.GET.get('name', None) |
313 me = request.GET.get('name', None) |
310 else: |
314 else: |
311 me = request.user.username |
315 me = request.user.username |
312 for name in names: |
316 for name in names: |