diff --git a/conf/templates/informant/default.html.j2 b/conf/templates/informant/default.html.j2 index 9fc9c84b78d6dc0087acec54857efc45573bc25c..37b9bb19e448878a80f29466aed509df1d591f0e 100644 --- a/conf/templates/informant/default.html.j2 +++ b/conf/templates/informant/default.html.j2 @@ -56,7 +56,7 @@ <strong>{{ _('Total number of events:') }}</strong> </td> <td> - {{ format_decimal(stats_events['count']) }} + {{ format_decimal(stats_events.get('count', 0)) }} </td> </tr> <tr> @@ -72,7 +72,7 @@ <strong>{{ _('Number of sent emails:') }}</strong> </td> <td> - {{ format_decimal(stats_reports['cnt_emails']) }} + {{ format_decimal(stats_reports.get('cnt_emails', 0)) }} </td> </tr> <tr> @@ -80,7 +80,7 @@ <strong>{{ _('Number of reported events:') }}</strong> </td> <td> - {{ format_decimal(stats_reports['cnt_events']) }} + {{ format_decimal(stats_reports.get('cnt_events', 0)) }} </td> </tr> <tr> diff --git a/conf/templates/informant/default.txt.j2 b/conf/templates/informant/default.txt.j2 index 7d3206d1fe6f0fdb50fc4b31811fb693292e58f2..aae8cd0fbd04d7a3c83302bcb00ac03e946a87c1 100644 --- a/conf/templates/informant/default.txt.j2 +++ b/conf/templates/informant/default.txt.j2 @@ -29,10 +29,10 @@ {{ '{}'.format('*' * 90) }} -{{ '{:40s}'.format(_('Total number of events:')) }} {{ '{:>10s}'.format(format_decimal(stats_events['count'])) }} +{{ '{:40s}'.format(_('Total number of events:')) }} {{ '{:>10s}'.format(format_decimal(stats_events.get('count', 0))) }} {{ '{:40s}'.format(_('Number of generated reports:')) }} {{ '{:>10s}'.format(format_decimal(stats_reports_cnt_all)) }} ({{ format_decimal(stats_reports_cnt) }} {{ _('summary') }}, {{ format_decimal(stats_reports_cnt_all - stats_reports_cnt) }} {{ _('extra') }}) -{{ '{:40s}'.format(_('Number of sent emails:')) }} {{ '{:>10s}'.format(format_decimal(stats_reports['cnt_emails'])) }} -{{ '{:40s}'.format(_('Number of reported events:')) }} {{ '{:>10s}'.format(format_decimal(stats_reports['cnt_events'])) }} +{{ '{:40s}'.format(_('Number of sent emails:')) }} {{ '{:>10s}'.format(format_decimal(stats_reports.get('cnt_emails', 0))) }} +{{ '{:40s}'.format(_('Number of reported events:')) }} {{ '{:>10s}'.format(format_decimal(stats_reports.get('cnt_events', 0))) }} {{ '{:40s}'.format(_('Summary for time period:')) }} {{ format_tzdatetime(dt_l) }} - {{ format_tzdatetime(dt_h) }} ({{ format_timedelta(dt_h - dt_l ) }}) {{ _('Contents') | upper }} diff --git a/lib/mentat/__init__.py b/lib/mentat/__init__.py index a8c65f117bef015f00acdbdbc5cce0584c6ab8c7..87149bccdcf04d2c5e92d95a7da3a66cb59fd637 100644 --- a/lib/mentat/__init__.py +++ b/lib/mentat/__init__.py @@ -20,4 +20,4 @@ open-source project. __author__ = "Jan Mach <jan.mach@cesnet.cz>" __credits__ = "Pavel Kácha <pavel.kacha@cesnet.cz>, Andrea Kropáčová <andrea.kropacova@cesnet.cz>" -__version__ = "2.7.6" +__version__ = "2.7.7"