Module: check_mk Branch: master Commit: 019e32d590cefb8d4cf2313e9b8f127bc3082d1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=019e32d590cefb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 1 08:18:21 2016 +0200 3355 FIX Fixed possible borken HW-/SW-Inventory history view --- .werks/3355 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3355 b/.werks/3355 new file mode 100644 index 0000000..d71b0dc --- /dev/null +++ b/.werks/3355 @@ -0,0 +1,10 @@ +Title: Fixed possible borken HW-/SW-Inventory history view +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459491473 + + diff --git a/ChangeLog b/ChangeLog index ecdcba4..6a93ee0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ * 3344 FIX: Removed host inventory painters and sorters from non host based views * 3345 FIX: Fixed exception when inventory painter was used as group painter * 3347 FIX: Improved performance when having a lot of users... + * 3355 FIX: Fixed possible borken HW-/SW-Inventory history view WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index b012d9d..6590f0d 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -1184,7 +1184,7 @@ multisite_datasources["invhist"] = { "table" : inv_history_table, "infos" : [ "host", "invhist" ], "keys" : [], - "idkeys" : [ "host_name", "invhist_date" ], + "idkeys" : [ "host_name", "invhist_time" ], } multisite_painters["invhist_time"] = {