Module: check_mk Branch: master Commit: 741549a59154c9d9a714d0fb03be9efce35224b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=741549a59154c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 11:52:50 2016 +0200 3973 FIX Backup: Fixed displaying wrong finish time after backup completion --- .werks/3973 | 9 +++++++++ ChangeLog | 1 + web/htdocs/backup.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3973 b/.werks/3973 new file mode 100644 index 0000000..449eaec --- /dev/null +++ b/.werks/3973 @@ -0,0 +1,9 @@ +Title: Backup: Fixed displaying wrong finish time after backup completion +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1477648349 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index caae362..7ca5610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 3902 FIX: Graph search view: Changing painter options made page empty * 3969 FIX: CentOS 5.5: Fixed incompatibility with the available OpenSSL 0.98... * 4037 FIX: Fix graphs that have optional metrics... + * 3973 FIX: Backup: Fixed displaying wrong finish time after backup completion WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 156e395..8f3ed5c 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -471,7 +471,7 @@ class Jobs(BackupEntityCollection): html.write(_("Started at %s") % render.date_and_time(state["started"])) duration = time.time() - state["started"] if state["state"] == "finished": - html.write(", Finished at %s" % render.date_and_time(state["started"])) + html.write(", Finished at %s" % render.date_and_time(state["finished"])) duration = state["finished"] - state["started"] if "size" in state: