[checkmk-commits] #2928 Fix display of rule set Do hardware/software Inventory

Module: check_mk Branch: master Commit: 7b6604d1ca9a1149eda6a603e7503abe7841e851 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b6604d1ca9a11… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Jan 29 10:24:07 2016 +0100 #2928 Fix display of rule set Do hardware/software Inventory When you selected one of the two options for setting the state then this was correctly saved but not correctly displayed in the rule table nor when editing the rule again. This has been fixed. --- .werks/2928 | 11 +++++++++++ ChangeLog | 3 ++- web/plugins/wato/inventory.py | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2928 b/.werks/2928 new file mode 100644 index 0000000..4be3ab3 --- /dev/null +++ b/.werks/2928 @@ -0,0 +1,11 @@ +Title: Fix display of rule set Do hardware/software Inventory +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1454059333 +Class: fix + +When you selected one of the two options for setting the state then +this was correctly saved but not correctly displayed in the rule table +nor when editing the rule again. This has been fixed. diff --git a/ChangeLog b/ChangeLog index f20a360..349c8a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,8 +100,8 @@ * 2832 netscaler_vserver: improved check output for unknown protocols... * 3033 check_http: Now supporting extended perfdata parameter of the check * 2456 palo_alto, palo_alto_sessions: Two new checks for Palo Alto firewalls. - * 2457 mssql_counters.sqlstats: New check to monitor several rates from the SQL statistics object * 2985 MongoDB: Introduced agent plugin and some checks... + * 2457 mssql_counters.sqlstats: New check to monitor several rates from the SQL statistics object * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... @@ -315,6 +315,7 @@ * 2831 FIX: Removing a previously set custom attribute for a contact did not work as intented... * 2973 FIX: showing subfolder info in WATO if there are more than four groups * 2964 FIX: Deleting site having hosts assigned links to list of hosts now + * 2928 FIX: Fix display of rule set Do hardware/software Inventory... Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/plugins/wato/inventory.py b/web/plugins/wato/inventory.py index 57d9c49..f84db39 100644 --- a/web/plugins/wato/inventory.py +++ b/web/plugins/wato/inventory.py @@ -55,7 +55,7 @@ register_rule(group, "<b>Note:</b> in order to get any useful " "result for agent based hosts make sure that you have installed " "the agent plugin <tt>mk_inventory</tt> on these hosts."), - forth = lambda x: { }, # convert from legacy None + forth = lambda x: x != None and x or {}, # convert from legacy None ), match = "all", )