Merge branch 'develop' into feature/react_test
This commit is contained in:
commit
e5e6541ac8
@ -88,7 +88,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td scope="col"> </td>
|
<td scope="col"> </td>
|
||||||
{% for date in log_stats.keys %}
|
{% for date in log_stats.keys %}
|
||||||
|
{% if interval == 'days' %}
|
||||||
<td scope="col">{{ date | date:'d.m' }}</td>
|
<td scope="col">{{ date | date:'d.m' }}</td>
|
||||||
|
{% else %}
|
||||||
|
<td scope="col">{{ date.1 | date:'F' }}</td>
|
||||||
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
@ -447,6 +447,7 @@ def statistic_page(request: WSGIRequest) -> HttpResponse:
|
|||||||
context['errors'] = data.errors
|
context['errors'] = data.errors
|
||||||
if data.warnings:
|
if data.warnings:
|
||||||
context['warnings'] = data.warnings
|
context['warnings'] = data.warnings
|
||||||
|
context['interval'] = data.interval
|
||||||
context['log_stats'] = stats if not context['errors'] else None
|
context['log_stats'] = stats if not context['errors'] else None
|
||||||
elif request.method == 'GET':
|
elif request.method == 'GET':
|
||||||
form = StatisticForm()
|
form = StatisticForm()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user