Module: check_mk
Branch: master
Commit: 1f7f36e90b62c110db1778ffa0ba607ecb31b5ca
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f7f36e90b62c1…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 4 17:07:16 2012 +0200
FIX: fix missing variable name in bulk inventory
---
web/htdocs/wato.py | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index d037128..4eed7ca 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2425,6 +2425,8 @@ def mode_bulk_inventory(phase):
entries += recurse_hosts(f, recurse, only_failed)
return entries
+ config.need_permission("wato.services")
+
# 'all' not set -> only inventorize checked hosts
if not html.var("all"):
complete_folder = False
@@ -2436,22 +2438,19 @@ def mode_bulk_inventory(phase):
hostnames = get_hostnames_from_checkboxes(filterfunc)
items = [ "%s|%s" % (g_folder[".path"], hostname)
for hostname in hostnames ]
+ for hostname in hostnames:
+ check_host_permissions(hostname)
# all host in this folder, maybe recursively
else:
complete_folder = True
entries = recurse_hosts(g_folder, html.get_checkbox("recurse"),
html.get_checkbox("only_failed"))
items = []
+ hostnames = []
for hostname, folder in entries:
check_host_permissions(hostname, folder=folder)
items.append("%s|%s" % (folder[".path"], hostname))
-
-
-
- # check all permissions before beginning inventory
- config.need_permission("wato.services")
- for hostname in hostnames:
- check_host_permissions(hostname)
+ hostnames.append(hostname)
if html.var("_start"):