[checkmk-commits] Check_MK Git: check_mk: #1546 FIX Fixed adding cluster nodes to new cluster in complain phase

Module: check_mk Branch: master Commit: e9fee081dab0924735d97756cc1bffd6cc832a4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9fee081dab092… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Dec 1 10:48:25 2014 +0100 #1546 FIX Fixed adding cluster nodes to new cluster in complain phase When adding a cluster without node, getting into the complain phase and then adding a node, the cluster node field list did not extend to make it possible to add multiple nodes. --- .bugs/2162 | 7 +++++-- .bugs/2166 | 7 +++++-- .werks/1546 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 10 +++------- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.bugs/2162 b/.bugs/2162 index 56dbf0a..63edbd8 100644 --- a/.bugs/2162 +++ b/.bugs/2162 @@ -1,8 +1,11 @@ Title: WATO diag page: "Retry this test" only works once Component: wato -State: open +Class: bug +State: done Date: 2014-05-05 18:14:16 Targetversion: future -Class: bug The javascript only receives one extra transaction id.. + +2014-12-01 10:19:17: changed state open -> done +Transids had been removed here. diff --git a/.bugs/2166 b/.bugs/2166 index 7e9dc6d..f1d187d 100644 --- a/.bugs/2166 +++ b/.bugs/2166 @@ -1,10 +1,13 @@ Title: WATO new cluster: Can only add one cluster node in the formular Component: wato -State: open +Class: bug +State: done Date: 2014-08-12 14:30:05 Targetversion: future -Class: bug - Create a new cluster within WATO, but omit the nodes field - Save formular. A warning appears, the nodes field is highlighted - The list of nodes does not auto-enlarge, so you can only add one node + +2014-12-01 10:43:09: changed state open -> done +Fixed. diff --git a/.werks/1546 b/.werks/1546 new file mode 100644 index 0000000..72fd17a --- /dev/null +++ b/.werks/1546 @@ -0,0 +1,11 @@ +Title: Fixed adding cluster nodes to new cluster in complain phase +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417426992 +Class: fix + +When adding a cluster without node, getting into the complain phase +and then adding a node, the cluster node field list did not extend to +make it possible to add multiple nodes. diff --git a/ChangeLog b/ChangeLog index be0385f..6f7f6cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 1540 FIX: Host diagnose page: Some tests were failing randomly * 1541 FIX: Fixed missing form fields for notification method when editing rbn default rule * 1542 FIX: Changed text of "debug_log" option to be clearer in distributed setups... + * 1546 FIX: Fixed adding cluster nodes to new cluster in complain phase... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 2b0fcfb..cac4fb6 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1495,13 +1495,9 @@ function list_of_strings_init(divid) { function list_of_strings_add_focus(oLastChild) { /* look for <input> in last child node and attach focus handler to it. */ - for (var j in oLastChild.childNodes) { - var o = oLastChild.childNodes[j]; - if (o.tagName == "INPUT") { - o.onfocus = function(e) { return list_of_strings_extend(this); }; - return; - } - } + var input = oLastChild.getElementsByTagName("input"); + if (input.length == 1) + input[0].onfocus = function(e) { return list_of_strings_extend(this); }; }