Quellcode durchsuchen

More formatting

Denis Merigoux vor 9 Jahren
Ursprung
Commit
bbd6ac11b4
1 geänderte Dateien mit 7 neuen und 3 gelöschten Zeilen
  1. 7 3
      counter/views.py

+ 7 - 3
counter/views.py

143
                                                       tzinfo=None),
143
                                                       tzinfo=None),
144
                                                   locale='fr', threshold=1)
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
                 reset.Seum = {'v': 0,
148
                 reset.Seum = {'v': 0,
149
                               'f': reset.counter.trigramme +
149
                               'f': reset.counter.trigramme +
150
                               " : " + reset.reason}
150
                               " : " + reset.reason}
327
                 datetime.now() - reset.timestamp.replace(tzinfo=None),
327
                 datetime.now() - reset.timestamp.replace(tzinfo=None),
328
                 locale='fr', threshold=1)
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
     # Drawing the graph
335
     # Drawing the graph
332
     data = ModelDataSource(resets, fields=['timestamp', 'Seum'])
336
     data = ModelDataSource(resets, fields=['timestamp', 'Seum'])
333
     chart = gchart.LineChart(data, options={
337
     chart = gchart.LineChart(data, options={