Module: check_mk
Branch: master
Commit: c00cede951bd8ec4fb0be5b1a582e47a059891d3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c00cede951bd8e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jan 9 08:52:20 2012 +0100
FIX: Fixed missing folders in "move to" dropdown fields
The id(g_folder) returned the same value for all the folders.
---
ChangeLog | 3 +++
web/htdocs/wato.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ad4f67a..bb8fd2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
* Added filter for log state (UP,DOWN,OK,CRIT...) to all log views
* New painter for normal and retry check interval (added to detail views)
+ WATO:
+ * FIX: Fixed missing folders in "move to" dropdown fields
+
BI:
* improve doc/treasures/check_bi_local.py: local check that creates
Nagios services out of BI aggregates
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 9fc43ae..049853f 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -1238,9 +1238,9 @@ def move_to_folder_combo(what, thing = None, top = False):
msg += " (%s)" % os_path
selections.append((os_path, msg))
selections.sort(cmp=lambda a,b: cmp(a[1].lower(), b[1].lower()))
- move_to_folder_combo_cache[id(g_folder)] = selections
+ move_to_folder_combo_cache[g_folder['.path']] = selections
else:
- selections = move_to_folder_combo_cache[id(g_folder)]
+ selections = move_to_folder_combo_cache[g_folder['.path']]
if len(selections) > 1:
if thing == None: