Module: check_mk
Branch: master
Commit: 33b23c99fec6cd21c5c8c8ebf14671c0f260fa03
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33b23c99fec6cd…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Aug 15 11:05:50 2011 +0200
FIX: fixed display of filters in Edit view
---
web/htdocs/js/check_mk.js | 4 ++++
web/htdocs/views.py | 4 +++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js
index 6ea8f72..75f330d 100644
--- a/web/htdocs/js/check_mk.js
+++ b/web/htdocs/js/check_mk.js
@@ -158,6 +158,10 @@ function pageWidth() {
function filter_activation(oid)
{
var selectobject = document.getElementById(oid);
+ if (!selectobject) {
+ alert("Could not find element " + oid + "!");
+ return;
+ }
var usage = selectobject.value;
var oTd = selectobject.parentNode.parentNode.childNodes[2];
var pTd = selectobject.parentNode;
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 4539e10..ee3306e 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -615,9 +615,11 @@ function toggle_section(nr, oImg) {
html.write("</tt></td>")
html.write("</tr>\n")
html.write("</table>\n")
+ # Set all filters into the proper display state
html.write("<script language=\"javascript\">\n")
for fname, filt in allowed_filters.items():
- html.write("filter_activation(\"filter_%s\");\n" % fname)
+ if fname not in ubiquitary_filters:
+ html.write("filter_activation(\"filter_%s\");\n" %
fname)
html.write("</script>\n")
section_footer(sid)