Merge remote-tracking branch 'origin/v3.0'

server/src/uds/reports/stats/pools_usage_day.py

@@ -99,9 +99,7 @@ class CountersPoolAssigned(StatsReport):
             except Exception:
                 continue
 
-            hours = {}
-            for i in range(24):
-                hours[i] = i * i
+            hours = [0] * 24
 
             for x in counters.getCounters(pool, counters.CT_ASSIGNED, since=start, to=end, max_intervals=24, use_max=True, all=False):
                 hour = x[0].hour

server/src/uds/templates/uds/reports/stats/pools-usage-day.html

@@ -31,10 +31,10 @@
             </thead>
             <tbody>
             {% for d in data|dictsort:"name.lower" %}
-            {% for h, v in d.hours.items %}
+            {% for v in d.hours %}
             <tr>
                 <td>{{ d.name }}</td>
-                <td>{{ h }}</td>
+                <td>{{ forloop.counter0 }}</td>
                 <td>{{ v }}</td>
             </tr>
             {% endfor %}