Selaa lähdekoodia

More formatting

Denis Merigoux 9 vuotta sitten
vanhempi
commit
bbd6ac11b4
1 muutettua tiedostoa jossa 7 lisäystä ja 3 poistoa
  1. 7 3
      counter/views.py

+ 7 - 3
counter/views.py

@@ -143,8 +143,8 @@ def home(request):
143 143
                                                       tzinfo=None),
144 144
                                                   locale='fr', threshold=1)
145 145
             }
146
-            if (counter.lastReset.who is None or
147
-                    counter.lastReset.who.id == counter.id):
146
+            if (reset.who is None or
147
+                    reset.who.id == reset.counter.id):
148 148
                 reset.Seum = {'v': 0,
149 149
                               'f': reset.counter.trigramme +
150 150
                               " : " + reset.reason}
@@ -327,7 +327,11 @@ def counter(request, id_counter):
327 327
                 datetime.now() - reset.timestamp.replace(tzinfo=None),
328 328
                 locale='fr', threshold=1)
329 329
         }
330
-        reset.Seum = {'v': 0, 'f': reset.reason}
330
+        if reset.selfSeum:
331
+            reset.Seum = {'v': 0, 'f': reset.reason}
332
+        else:
333
+            reset.Seum = {'v': 0, 'f': 'De ' + reset.who.trigramme + ' : ' +
334
+                          reset.reason}
331 335
     # Drawing the graph
332 336
     data = ModelDataSource(resets, fields=['timestamp', 'Seum'])
333 337
     chart = gchart.LineChart(data, options={