Просмотр исходного кода

Handle case where no reset yet

Victor Quach лет назад: 9
Родитель
Сommit
f1ff61530f
2 измененных файлов с 5 добавлено и 4 удалено
  1. 1 1
      counter/templates/homeTemplate.html
  2. 4 3
      counter/views.py

+ 1 - 1
counter/templates/homeTemplate.html

12
 							<b>{{ myCounter.trigramme }}</b> <small>{{ myCounter.name }}</small>
12
 							<b>{{ myCounter.trigramme }}</b> <small>{{ myCounter.name }}</small>
13
 						</a>
13
 						</a>
14
 						{% if not myCounter.lastReset.noSeum %}
14
 						{% if not myCounter.lastReset.noSeum %}
15
-							<span class="pull-right badge" data-toggle="tooltip" data-placement="top" title="{{ myCounter.likersString }}">
15
+							<span class="pull-right badge" {% if myCounter.likeCount %} data-toggle="tooltip" data-placement="top" title="{{ myCounter.likersString }}" {% endif %}>
16
 								<span class="glyphicon glyphicon-fire"></span>&emsp;{{ myCounter.likeCount }}
16
 								<span class="glyphicon glyphicon-fire"></span>&emsp;{{ myCounter.likeCount }}
17
 							</span>
17
 							</span>
18
 						{% endif %}
18
 						{% endif %}

+ 4 - 3
counter/views.py

55
             likesMe = Like.objects.filter(
55
             likesMe = Like.objects.filter(
56
                 reset=myCounter.lastReset)
56
                 reset=myCounter.lastReset)
57
             myCounter.likeCount = likesMe.count()
57
             myCounter.likeCount = likesMe.count()
58
-            myCounter.likersString = functools.reduce(
59
-                        lambda a,b: a + ", " +  b,
60
-                        [like.liker.trigramme for like in likesMe])
58
+            if myCounter.likeCount:
59
+                myCounter.likersString = functools.reduce(
60
+                            lambda a,b: a + ", " +  b,
61
+                            [like.liker.trigramme for like in likesMe])
61
         myCounter.lastReset.formatted_delta = format_timedelta(
62
         myCounter.lastReset.formatted_delta = format_timedelta(
62
             myCounter.lastReset.delta, locale='fr', threshold=1)
63
             myCounter.lastReset.delta, locale='fr', threshold=1)
63
     except Counter.DoesNotExist:
64
     except Counter.DoesNotExist: