瀏覽代碼

Fix a bug and optimise counter page

Camille Masset 9 年之前
父節點
當前提交
9ed2617107
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      counter/views/counter.py

+ 3 - 3
counter/views/counter.py

28
 
28
 
29
     counter = Counter.objects.prefetch_related(
29
     counter = Counter.objects.prefetch_related(
30
         # we get the related resets annotated with their number of likes
30
         # we get the related resets annotated with their number of likes
31
-        Prefetch('resets', queryset=Reset.objects.annotate(likes_count=Count('likes'))),
31
+        Prefetch('resets', queryset=Reset.objects.select_related('who', 'counter').annotate(likes_count=Count('likes'))),
32
         'resets__likes'
32
         'resets__likes'
33
     ).get(pk=id_counter)
33
     ).get(pk=id_counter)
34
     resets = list(counter.resets.order_by('-timestamp'))
34
     resets = list(counter.resets.order_by('-timestamp'))
55
 
55
 
56
         counter.lastLikes = list(counter.lastReset.likes.all())
56
         counter.lastLikes = list(counter.lastReset.likes.all())
57
         counter.alreadyLiked = myCounter.id in [l.liker.id for l in counter.lastLikes]
57
         counter.alreadyLiked = myCounter.id in [l.liker.id for l in counter.lastLikes]
58
-        counter.likeCount = len(counter.lastLikes)
59
-        if counter.likeCount > 0:
58
+        counter.likes_count = len(counter.lastLikes)
59
+        if counter.likes_count > 0:
60
             counter.likersString = ", ".join(like.liker.trigramme for like in counter.lastLikes)
60
             counter.likersString = ", ".join(like.liker.trigramme for like in counter.lastLikes)
61
 
61
 
62
     for reset in resets:
62
     for reset in resets: