[checkmk-commits] Check_MK Git: check_mk: FIX: Edit view: could not edit filter settings

Module: check_mk Branch: master Commit: 3df61a777d233880e63cfb4e53200737ba31b8f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df61a777d2338… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 26 21:21:33 2012 +0200 FIX: Edit view: could not edit filter settings --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d277058..9cdee8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Multisite: * FIX: Fixed layout of some dropdown fields in view filters * Make heading in each page clickable -> reload page + * FIX: Edit view: couldn't edit filter settings Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 695a2ee..b92519e 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -294,13 +294,18 @@ function filter_activation(oSelect) oDiv.setAttribute("className", "filtersetting " + usage); oDiv.setAttribute("class", "filtersetting " + usage); + // If the filter is not in state hard or show, disable filter + // input var disabled = usage != "hard" && usage != "show"; - var oNode; - for (var i in oDiv.childNodes) { - oNode = oDiv.childNodes[i]; - if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { - oNode.disabled = disabled; + var oFloatFilter = oSelect.nextSibling; + if (oFloatFilter) { + for (var i in oFloatFilter.childNodes) { + oNode = oFloatFilter.childNodes[i]; + if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { + oNode.disabled = disabled; + } } + oFloatFilter = null; } p = null;