[checkmk-commits] Check_MK Git: check_mk: FIX: audit log was not shown if no entry for today existed

Module: check_mk Branch: master Commit: 51e838ad97623bc3ec70c07ec4ea405034c1f93e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51e838ad97623b… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri May 18 16:25:39 2012 +0200 FIX: audit log was not shown if no entry for today existed --- ChangeLog | 1 + web/htdocs/wato.css | 13 ++----------- web/htdocs/wato.py | 49 +++++++++++++++++++++++++++++-------------------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index b44149d..67a9bf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * New layout and new internal implementation of input forms * New layout for view overview and view editor * Split up host search in two distinct pages + * FIX: audit log was not shown if no entry for today existed * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 280e35d..1cb7d5f 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -162,17 +162,6 @@ Boston, MA 02110-1301 USA. padding: 2px 6px; } -.wato table.auditlog.pending td { - border-color: #f80; -} -.wato table.auditlog.pending tr.even0 { - background-color: #fda; -} - -.wato table.auditlog.pending tr.odd0 { - background-color: #fc8; -} - .wato td.dns { color: #666; } @@ -477,6 +466,8 @@ table.validationerror img { /* Controls for the audit log paged mechanism */ .wato div.paged_controls { float: right; + position: relative; + top: 3px; } /* Special styles for configuration and rule editor */ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fbdad5b..6034a4e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3654,11 +3654,20 @@ def fmt_time(t): return time.strftime('%H:%M:%S', time.localtime(t)) def paged_log(log): - start = html.var('start', None) + start = int(html.var('start', 0)) if not start: - start = time.time() - start_time, end_time = get_timerange(int(start)) + start = int(time.time()) + + while True: + log_today, times = paged_log_from(log, start) + if len(log) == 0 or len(log_today) > 0: + return log_today, times + else: # No entries today, but log not empty -> go back in time + start -= 24 * 3600 + +def paged_log_from(log, start): + start_time, end_time = get_timerange(start) previous_log_time = None next_log_time = None first_log_index = None @@ -3693,23 +3702,22 @@ def paged_log(log): def display_paged((start_time, end_time, previous_log_time, next_log_time)): html.write('<div class=paged_controls>') - html.write(' <b>%s</b> ' % (_('%s to %s') % (fmt_date(start_time), - fmt_date(end_time)))) - - if previous_log_time is not None: - html.buttonlink(html.makeuri([('start', previous_log_time)]), _("<"), - title = '%s: %s' % (_("Older events"), fmt_date(previous_log_time))) + if next_log_time is not None: + html.icon_button(html.makeuri([('start', get_timerange(int(time.time()))[0])]), + _("Most recent events"), "start") + html.icon_button(html.makeuri([('start', next_log_time)]), + '%s: %s' % (_("Newer events"), fmt_date(next_log_time)), + "back") else: - html.buttonlink(html.makeuri([]), _("<"), disabled = True) - - html.buttonlink(html.makeuri([('start', get_timerange(int(time.time()))[0])]), _("o"), - title = _("Todays events")) + html.empty_icon_button() + html.empty_icon_button() - if next_log_time is not None: - html.buttonlink(html.makeuri([('start', next_log_time)]), _(">"), - title = '%s: %s' % (_("Newer events"), fmt_date(next_log_time))) + if previous_log_time is not None: + html.icon_button(html.makeuri([('start', previous_log_time)]), + '%s: %s' % (_("Older events"), fmt_date(previous_log_time)), + "forth") else: - html.buttonlink(html.makeuri([]), _(">"), disabled = True) + html.empty_icon_button() html.write('</div>') @@ -3722,10 +3730,12 @@ def render_audit_log(log, what, with_filename = False): empty_msg = _("No pending changes, monitoring server is up to date.") if len(log) == 0: - htmlcode += "<div class=info>%s</div>" % empty_msg + html.write("<div class=info>%s</div>" % empty_msg) return + elif what == 'audit': - htmlcode += "<h3>" + _("Audit logfile") + "</h3>" + htmlcode += "<h3>" + _("Audit logfile for %s") % fmt_date(times[0]) + "</h3>" + elif what == 'pending': if is_distributed(): htmlcode += "<h3>" + _("Changes that are not activated on all sites:") + "</h3>" @@ -3752,7 +3762,6 @@ def render_audit_log(log, what, with_filename = False): display_paged(times) else: html.write(htmlcode) - # html.show_warning(htmlcode) def export_audit_log(): html.req.content_type = "text/csv; charset=UTF-8"