Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64231 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b837253cb00c5f02a8044a4a5327133640a9a6d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b837253cb00c5f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 6 21:13:35 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: FIX: deletion of automation accounts now works

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 043ac6d1c6ade678387cb4e3fb910134c69377aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=043ac6d1c6ade6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:07:35 2012 +0100 FIX: deletion of automation accounts now works --- ChangeLog | 4 ++++ web/htdocs/wato.py | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 286df4f..e892377 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.2.0b2: + WATO: + * FIX: deletion of automation accounts now works + 1.2.0b1: Core, Setup, etc.: * new tool 'livedump' for dumping configuration and status diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 23d4290..86629a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7234,6 +7234,14 @@ def save_users(profiles): elif os.path.exists(auth_file): os.remove(auth_file) + # Remove settings directories of non-existant users + dir = defaults.var_dir + "/web" + for e in os.listdir(dir): + if e not in ['.', '..'] and e not in profiles: + entry = dir + "/" + e + if os.path.isdir(entry): + shutil.rmtree(entry) + # Call the users_saved hook call_hook_users_saved(users)

12 years, 6 months

Check_MK Git: check_mk: Changed version number in ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6db71db33c0f7a2695419c391e877c91709ba025 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6db71db33c0f7a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 11:14:12 2012 +0100 Changed version number in ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0788caf..286df4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.1.13i4: +1.2.0b1: Core, Setup, etc.: * new tool 'livedump' for dumping configuration and status information from one monitoring core and importing this

12 years, 6 months

Check_MK Git: check_mk: Switched version to 1.2.0b1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 144099d42be97d9941ff9058df8f638bd05d1c69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=144099d42be97d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 11:12:10 2012 +0100 Switched version to 1.2.0b1 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124967 -> 124978 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f6c1490..33bab94 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.13i4 +VERSION = 1.2.0b1 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 89ce3e4..5245d69 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.13i4 +echo Version: 1.2.0b1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 5cbb1e9..ad96498 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.13i4 +echo Version: 1.2.0b1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 727e0fb..a9b18f4 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.1.13i4 +echo Version: 1.2.0b1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 68e3329..f4cd1c9 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.13i4 +echo Version: 1.2.0b1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 4cf39ab..1102de0 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.13i4 +echo Version: 1.2.0b1 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a9d8880..e6634a6 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -73,7 +73,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.1.13i4" +#define CHECK_MK_VERSION "1.2.0b1" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 00eaf21..3636019 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 1dae2f4..d23b3c1 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index a20d65b..7a10ade 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index d7e6a6b..3be23f5 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.1.13i4" +!define CHECK_MK_VERSION "1.2.0b1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index dc3408d..8f2ac0a 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.13i4-1_all.deb net optional +check-mk_1.2.0b1-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 5b4a7a6..c6cc5ec 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.13i4], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0b1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index 6345c36..64668ca 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.13i4 +VERSION=1.2.0b1 NAME=check_mk LANG= LC_ALL=

12 years, 6 months

Check_MK Git: check_mk: FIX: User alias and notification enabling was not saved

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 72be0aa994ac399fae09d0176469a0b339b1ffa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72be0aa994ac39… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 10:59:01 2012 +0100 FIX: User alias and notification enabling was not saved --- ChangeLog | 1 + web/htdocs/wato.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 559ea0f..0788caf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * FIX: Fixed wrong label "Main Overview" shown for moved WATO folders in foldertree snapin * FIX: Fixed localization of empty host tags + * FIX: User alias and notification enabling was not saved Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index da19c0e..23d4290 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7043,7 +7043,8 @@ def mode_edit_user(phase): html.write("<tr><td class=legend colspan=2>") html.write(_("Notification options<br><i>Here you specify which types of alerts " - "will be notified to this contact.</i>")) + "will be notified to this contact. Note: these settings will only be saved " + "and used if the user is member of a contact group.</i>")) html.write("</td><td class=content>") for title, what, opts in [ ( _("Host events"), "host", "durfs"), (_("Service events"), "service", "wucrfs") ]: @@ -7175,8 +7176,12 @@ def split_dict(d, keylist, positive): def save_users(profiles): # TODO: delete var/check_mk/web/$USER of non-existing users. Do we # need to remove other references as well? - non_contact_keys = [ "roles", "password", "locked", "automation_secret", "language" ] - multisite_keys = [ "roles", "language" ] + + # Keys not to put into contact definitions for Check_MK + non_contact_keys = [ "roles", "notifications_enabled", "password", "locked", "automation_secret", "language" ] + + # Keys to put into multisite configuration + multisite_keys = [ "roles", "notifications_enabled", "locked", "automation_secret", "alias", "language", ] # Remove multisite keys in contacts. And use only such entries # that have any contact groups assigned to. @@ -7187,7 +7192,7 @@ def save_users(profiles): in profiles.items() ] if e[1].get("contactgroups")) - # Only allow explicit defined attributes to be written to multisite config + # Only allow explicitely defined attributes to be written to multisite config users = {} for uid, profile in profiles.items(): users[uid] = dict([ (p, val) for p, val in profile.items() if p in multisite_keys ])

12 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91f7f5a184a7e07baabccee60bc5646efe825582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91f7f5a184a7e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 10:59:05 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba45a90f486598adde2308bd635c0c88307082d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba45a90f486598… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 9 08:59:43 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 6 months

Check_MK Git: check_mk: WATO: Fixed help text of interface error rate levels

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2dd4705e755fc65e23e4b19ce26a6299fd5c6925 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dd4705e755fc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 9 08:55:03 2012 +0100 WATO: Fixed help text of interface error rate levels --- web/plugins/wato/check_parameters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b6a5f6f..896d494 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -566,7 +566,7 @@ checkgroups.append(( Tuple( title = _("Levels for error rates"), help = _("This levels make the check go warning or critical whenever the " - "<b>percentual error rate</b> of the monitored interface exceeds " + "<b>percentual error rate</b> of the monitored interface reaches " "the given bounds. The error rate is computed by dividing number of " "errors by the total number of packets (successful plus errors)."), elements = [

12 years, 6 months

Check_MK Git: check_mk: WATO: ListOf: move-buttons work, still not persist

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1aa55a11b885d3a539237ec4739229f1b7c6939f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1aa55a11b885d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 17:26:56 2012 +0100 WATO: ListOf: move-buttons work, still not persist --- web/htdocs/htmllib.py | 4 +- web/htdocs/js/checkmk.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/pages.css | 4 +++ web/htdocs/valuespec.py | 14 +++++++----- web/htdocs/wato.css | 3 +- 5 files changed, 65 insertions(+), 9 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0576c16..bad1ee9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -350,10 +350,10 @@ class html: 'src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>\n' % (url, onclick, style, help, icon)) + '</a>' % (url, onclick, style, help, icon)) def empty_icon_button(self): - self.write('<img class="iconbutton trans" src="images/trans.png">\n') + self.write('<img class="iconbutton trans" src="images/trans.png">') def jsbutton(self, varname, text, onclick, style=''): if style: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 20abfaf..20aab3a 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1458,12 +1458,14 @@ function valuespec_listof_add(varprefix, magic) { var oTable = document.getElementById(varprefix + "_table"); if (count == 0) { // first: no <tbody> present! oTable.innerHTML = "<tbody><tr>" + htmlcode + "</tr></tbody>"; + valuespec_listof_fixarrows(oTable.childNodes[0]); } else { var oTbody = oTable.childNodes[0]; var oTr = document.createElement("tr") oTr.innerHTML = htmlcode; oTbody.appendChild(oTr); + valuespec_listof_fixarrows(oTbody); } } @@ -1476,3 +1478,50 @@ function valuespec_listof_delete(oA, varprefix, nr) { oTdContent.innerHTML = '<input type=hidden name="_' + varprefix + '_deleted_' + nr + '" value=1>' oTr.style.display = "none"; } + +function valuespec_listof_move(oA, varprefix, nr, where) { + var oTr = oA.parentNode.parentNode; // TR to move + var oTbody = oTr.parentNode; + + if (where == "up") { + var sib = oTr.previousSibling; + oTbody.removeChild(oTr); + oTbody.insertBefore(oTr, sib); + } + else /* down */ { + var sib = oTr.nextSibling; + oTbody.removeChild(oTr); + if (sib == oTbody.lastChild) + oTbody.appendChild(oTr); + else + oTbody.insertBefore(oTr, sib.nextSibling); + } + valuespec_listof_fixarrows(oTbody); +} + + +function valuespec_listof_fixarrows(oTbody) { + for (var i in oTbody.childNodes) { + var oTd = oTbody.childNodes[i].childNodes[0]; /* TD with buttons */ + var oUpTrans = oTd.childNodes[1]; + var oUp = oTd.childNodes[2]; + if (i == 0) { + oUpTrans.style.display = ""; + oUp.style.display = "none"; + } + else { + oUpTrans.style.display = "none"; + oUp.style.display = ""; + } + var oDownTrans = oTd.childNodes[3]; + var oDown = oTd.childNodes[4]; + if (i >= oTbody.childNodes.length - 1) { + oDownTrans.style.display = ""; + oDown.style.display = "none"; + } + else { + oDownTrans.style.display = "none"; + oDown.style.display = ""; + } + } +} diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 6a4915b..a3e4d48 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -324,6 +324,10 @@ tr.groupheader a:hover { img.iconbutton { width: 20px; height: 20px; + padding: 0px 2px; +} +img.iconbutton.trans { + width: 100px; } /*-------------------------------------------------------------------------. diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 7622d1f..e630346 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -503,14 +503,15 @@ class ListOf(ValueSpec): js = "valuespec_listof_delete(this, '%s', '%s')" % (vp, nr) html.icon_button("#", _("Delete this entry"), "delete", onclick=js) - def move_button(self, vp, nr, where, visible): + def move_button(self, vp, nr, where): js = "valuespec_listof_move(this, '%s', '%s', '%s')" % (vp, nr, where) where_name = { "up" : _("up"), "down" : _("down"), } + html.empty_icon_button() # needed as placeholder html.icon_button("#", _("Move this entry %s") % where_name[where], - where, onclick=js, style = not visible and "display: none;" or "") + where, onclick=js) # Implementation idea: we render our element-valuespec # once in a hidden div that is not evaluated. All occurances @@ -526,8 +527,8 @@ class ListOf(ValueSpec): html.write('<table style="display:none" id="%s_prototype">' % varprefix) html.write('<tr><td class=vlof_buttons>') self.del_button(varprefix, self._magic) - self.move_button(varprefix, self._magic, "up", True) - self.move_button(varprefix, self._magic, "down", True) + self.move_button(varprefix, self._magic, "up") + self.move_button(varprefix, self._magic, "down") html.write('</td><td class=vlof_content>') self._valuespec.render_input( varprefix + "_" + self._magic, @@ -539,8 +540,8 @@ class ListOf(ValueSpec): for nr, v in enumerate(value): html.write('<tr><td class=vlof_buttons>') self.del_button(varprefix, nr+1) - self.move_button(varprefix, self._magic, "up", nr > 0) - self.move_button(varprefix, self._magic, "down", nr < len(value) - 1) + self.move_button(varprefix, self._magic, "up") # visibility fixed by javascript + self.move_button(varprefix, self._magic, "down") html.write("</td><td class=vlof_content>") self._valuespec.render_input(varprefix + "_%d" % (nr+1), v) html.write("</td></tr>") @@ -548,6 +549,7 @@ class ListOf(ValueSpec): html.write("<br>") html.jsbutton(varprefix + "_add", self._add_label, "valuespec_listof_add('%s', '%s')" % (varprefix, self._magic)); + html.javascript("valuespec_listof_fixarrows(document.getElementById('%s_table').childNodes[0]);" % varprefix) def canonical_value(self): return [] diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 71862de..0611f5a 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -306,7 +306,8 @@ table.validationerror img { } .wato img.trans { - width: 24px; + width: 16px; + height: 16px; } .wato td.value img { width: 20px;

12 years, 6 months

Check_MK Git: check_mk: ListOf: reordering now works like a charm :-)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f313ba8951a075bf79712a39ce82b672de2d6e4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f313ba8951a075… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 17:52:08 2012 +0100 ListOf: reordering now works like a charm :-) --- ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 22 +++++++++++++++------- web/htdocs/valuespec.py | 14 ++++++++++---- web/htdocs/wato.css | 2 +- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8893475..559ea0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ of host and service (= downtime alerts) WATO: + * Hosttag-editor: allow reordering of tags * Create very basic sample configuration when using WATO the first time (three tag groups, two rules) * Much more checks are configurable via WATO now diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bad1ee9..cc81e2f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -275,7 +275,7 @@ class html: def hidden_field(self, var, value): if value != None: - self.write("<input type=hidden name=%s value=\"%s\">\n" % (var, attrencode(value))) + self.write("<input type=hidden name=%s value=\"%s\">" % (var, attrencode(value))) # Beware: call this method just before end_form(). It will # add all current non-underscored HTML variables as hiddedn diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 20aab3a..ec8fe90 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1474,9 +1474,15 @@ function valuespec_listof_add(varprefix, magic) { // input element with the name varprefix + "_deleted_%nr" function valuespec_listof_delete(oA, varprefix, nr) { var oTr = oA.parentNode.parentNode; // TR - var oTdContent = oTr.childNodes[1]; - oTdContent.innerHTML = '<input type=hidden name="_' + varprefix + '_deleted_' + nr + '" value=1>' - oTr.style.display = "none"; + var oTbody = oTr.parentNode; + oInput = document.createElement("input"); + oInput.type = "hidden"; + oInput.name = "_" + varprefix + '_deleted_' + nr + oInput.value = "1" + var oTable = oTbody.parentNode; + oTable.parentNode.insertBefore(oInput, oTable); + oTbody.removeChild(oTr); + valuespec_listof_fixarrows(oTbody); } function valuespec_listof_move(oA, varprefix, nr, where) { @@ -1503,8 +1509,10 @@ function valuespec_listof_move(oA, varprefix, nr, where) { function valuespec_listof_fixarrows(oTbody) { for (var i in oTbody.childNodes) { var oTd = oTbody.childNodes[i].childNodes[0]; /* TD with buttons */ - var oUpTrans = oTd.childNodes[1]; - var oUp = oTd.childNodes[2]; + var oIndex = oTd.childNodes[0]; + oIndex.value = "" + (parseInt(i) + 1); + var oUpTrans = oTd.childNodes[2]; + var oUp = oTd.childNodes[3]; if (i == 0) { oUpTrans.style.display = ""; oUp.style.display = "none"; @@ -1513,8 +1521,8 @@ function valuespec_listof_fixarrows(oTbody) { oUpTrans.style.display = "none"; oUp.style.display = ""; } - var oDownTrans = oTd.childNodes[3]; - var oDown = oTd.childNodes[4]; + var oDownTrans = oTd.childNodes[4]; + var oDown = oTd.childNodes[5]; if (i >= oTbody.childNodes.length - 1) { oDownTrans.style.display = ""; oDown.style.display = "none"; diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e630346..7026177 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -526,6 +526,7 @@ class ListOf(ValueSpec): # Render reference element for cloning html.write('<table style="display:none" id="%s_prototype">' % varprefix) html.write('<tr><td class=vlof_buttons>') + html.hidden_field(varprefix + "_indexof_" + self._magic, "") # reconstruct order after moving stuff self.del_button(varprefix, self._magic) self.move_button(varprefix, self._magic, "up") self.move_button(varprefix, self._magic, "down") @@ -539,6 +540,7 @@ class ListOf(ValueSpec): html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) for nr, v in enumerate(value): html.write('<tr><td class=vlof_buttons>') + html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "") # reconstruct order after moving stuff self.del_button(varprefix, nr+1) self.move_button(varprefix, self._magic, "up") # visibility fixed by javascript self.move_button(varprefix, self._magic, "down") @@ -560,10 +562,14 @@ class ListOf(ValueSpec): def from_html_vars(self, varprefix): value = [] - for n in range(1, 1 + int(html.var(varprefix + "_count"))): - if not html.var("_%s_deleted_%d" % (varprefix, n)): - value.append(self._valuespec.from_html_vars( - varprefix + "_%d" % n)) + n = 0 + while True: + indexof = html.var(varprefix + "_indexof_%d" % (n+1)) + if indexof == None: + break; + value.append(self._valuespec.from_html_vars( + varprefix + "_%d" % int(indexof))) + n += 1 return value def validate_datatype(self, value, varprefix): diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 0611f5a..b0d76db 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -306,7 +306,7 @@ table.validationerror img { } .wato img.trans { - width: 16px; + width: 20px; height: 16px; } .wato td.value img {

12 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits