[checkmk-commits] Check_MK Git: check_mk: FIX: "move to" dropdown in IE9 works again

Module: check_mk Branch: master Commit: 56486f5a6da0ca89cab965aba7ac03aab4b77183 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56486f5a6da0ca… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Oct 6 14:29:39 2011 +0200 FIX: "move to" dropdown in IE9 works again --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 3 ++- web/htdocs/wato.py | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeec1c6..7af2c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ WATO: * FIX: "bulk move to" at the top of wato hostlists works again * FIX: IE<9: Fixed problem with checkbox events when editing a host + * FIX: "move to" dropdown in IE9 works again 1.1.11i4: Core, Setup, etc.: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 0439168..f1e8e16 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1025,6 +1025,7 @@ function highlight_row(elem, on) { }); checkbox = null; } + return false; } function highlight_elem(elem, on) { @@ -1040,7 +1041,7 @@ function highlight_elem(elem, on) { var childs = elem.childNodes; for(var i = 0; i < childs.length; i++) - if(childs[i].nodeName !== '#text') + if(childs[i].nodeName !== '#text' && childs[i].nodeName !== 'OPTION') highlight_elem(childs[i], on); } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c1ee266..e30e7c0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2547,10 +2547,9 @@ def host_move_combo(host = None, top = False): onchange = "update_bulk_moveto(this.value)", attrs = {'class': 'bulk_moveto'}) else: - html.hidden_field("host", host) uri = html.makeuri([("host", host), ("_transid", html.current_transid() )]) - html.sorted_select(None, selections, "", - "location.href='%s&_move_host_to=' + this.value;" % uri); + html.sorted_select("_move_%s" % host, selections, "", + "location.href='%s&_move_host_to=' + this.value;return true;" % uri); def move_hosts_to(hostnames, target_filename):