Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: FIX: Context links added by hooks are now hidden by the display

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5d243a589241c5776c484c24ca2c4a5610451e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5d243a589241c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 10:08:38 2012 +0200 FIX: Context links added by hooks are now hidden by the display option "B" again --- ChangeLog | 4 +++- web/htdocs/views.py | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54a1456..93992a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,9 @@ * Make heading in each page clickable -> reload page * FIX: Edit view: couldn't edit filter settings * FIX: Fixed styling of links in multisite context help - * IX: Fixed "select all" button for IE + * FIX: Fixed "select all" button for IE + * FIX: Context links added by hooks are now hidden by the display + option "B" again WATO: * IX: Fixed "select all" button in hosts & folders for IE diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d253b3f..5d7cc82 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1592,7 +1592,8 @@ def show_context_links(thisview, active_filters, show_filters, display_options, painter_options, command_form, show_checkboxes): # html.begin_context_buttons() called automatically by html.context_button() # That way if no button is painted we avoid the empty container - execute_hooks('buttons-begin') + if 'B' in display_options: + execute_hooks('buttons-begin') filter_isopen = html.var("filled_in") != "filter" and thisview["mustsearch"] if 'F' in display_options: @@ -1668,7 +1669,9 @@ def show_context_links(thisview, active_filters, show_filters, display_options, (thisview["owner"], thisview["name"], backurl) html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) - execute_hooks('buttons-end') + if 'B' in display_options: + execute_hooks('buttons-end') + html.end_context_buttons() # Collect all views that share a context with thisview. For example

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed styling of links in multisite context help

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0ff7c6abb1dfee0656982a4f28663474dc1e80b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0ff7c6abb1dfe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 09:29:18 2012 +0200 FIX: Fixed styling of links in multisite context help --- ChangeLog | 1 + web/htdocs/pages.css | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8995898..fcc3dd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 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 + * FIX: Fixed styling of links in multisite context help WATO: * IX: Fixed "select all" button in hosts & folders for IE diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 3e9a738..ce03d08 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -746,6 +746,14 @@ div.help { display: inline-block; } +div.help a { + color: black; +} + +div.help a:hover { + text-decoration: none; +} + table.data div.help { box-shadow: 0 0 3px #000; }

12 years, 4 months

Check_MK Git: check_mk: WATO view editor: Made new strip_bad_chars function work with unicode strings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a9da332ff26d6b4d8367c41e2674d48512e12b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a9da332ff26d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 09:16:55 2012 +0200 WATO view editor: Made new strip_bad_chars function work with unicode strings --- web/htdocs/forms.py | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 8151ea9..26b3f5d 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -98,7 +98,19 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, # New functions for painting forms def strip_bad_chars(x): - return "".join([c for c in x if c > ' ' and c < 'z']).translate(None, "'&;<>\"") + s = "".join([c for c in x if c > ' ' and c < 'z']) + + if type(s) == unicode: + return s.translate({ + ord(u"'"): None, + ord(u"&"): None, + ord(u";"): None, + ord(u"<"): None, + ord(u">"): None, + ord(u"\""): None, + }) + else: + return s.translate(None, u"'&;<>\"") def header(title, isopen = True, table_id = ""): global g_header_open

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed help positioning in view editors filter form

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 595555dc1834ec192fef0d3e39137810ae355df1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=595555dc1834ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 09:25:51 2012 +0200 FIX: Fixed help positioning in view editors filter form --- web/htdocs/views.css | 3 +++ web/htdocs/views.py | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index e27e3d0..d28c7af 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -392,6 +392,9 @@ table.data.single td.perfometer div.title { | Styles used while editing a view in the view editor | '-------------------------------------------------------------------------*/ +div.clear { + clear: left; +} div.filtersetting > select { float: left; margin-right: 10px; diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6fec2c6..d253b3f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -607,6 +607,7 @@ def page_edit_view(): "", "filter_activation(this)") show_filter(filt) html.write('</div>') + html.write('<div class=clear></div>') html.help(filt.comment) # Set all filters into the proper display state

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed "select all" button for IE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0bfa42348307847c40d7431ece08696f0b4d732e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bfa4234830784… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 10:01:33 2012 +0200 FIX: Fixed "select all" button for IE --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcc3dd0..54a1456 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * Make heading in each page clickable -> reload page * FIX: Edit view: couldn't edit filter settings * FIX: Fixed styling of links in multisite context help + * IX: Fixed "select all" button for IE WATO: * IX: Fixed "select all" button in hosts & folders for IE diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d3f631a..707ca10 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1071,13 +1071,15 @@ function toggle_group_rows(checkbox) { if(group_start === null) group_start = 0; if(group_end === null) - group_end = rows.length - 1; + group_end = rows.length; // Found the group start and end row of the checkbox! var group_rows = []; - for(var a = group_start; a < group_end; a++) - if(rows[a].tagName === 'TR') + for(var a = group_start; a < group_end; a++) { + if(rows[a].tagName === 'TR') { group_rows.push(rows[a]); + } + } toggle_all_rows(group_rows); group_rows = null; @@ -1153,9 +1155,12 @@ function get_all_checkboxes(container) { for(var i = 0; i < container.length; i++) { var childs = container[i].getElementsByTagName('input'); - for(var a = 0; a < childs.length; a++) - if(childs[a].type == 'checkbox') + for(var a = 0; a < childs.length; a++) { + if(childs[a].type == 'checkbox') { checkboxes.push(childs[a]); + } + } + childs = null; }

12 years, 4 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: f69302f5e3d98eeb53a5bb917ca01ca145ebfb6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f69302f5e3d98e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 10:02:32 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: ValueSpec Dropdown: allow dynamic choices

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 07aa8744c07c9963fed4d1646126f7e758ded8f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07aa8744c07c99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 30 12:05:24 2012 +0200 ValueSpec Dropdown: allow dynamic choices --- web/htdocs/valuespec.py | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 12635c5..5ee565e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -725,6 +725,9 @@ class Checkbox(ValueSpec): # a choices name. # Note: The list of choices may contain 2-tuples or 3-tuples. # The format is (value, text {, icon} ) +# choices may also be a function that returns - when called +# wihtout arguments - such a tuple list. That way the choices +# can by dynamically computed class DropdownChoice(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) @@ -732,8 +735,14 @@ class DropdownChoice(ValueSpec): self._help_separator = kwargs.get("help_separator") self._label = kwargs.get("label") + def choices(self): + if type(self._choices) == list: + return self._choices + else: + return self._choices() + def canonical_value(self): - return self._choices[0][0] + return self.choices()[0][0] def render_input(self, varprefix, value): if self._label: @@ -741,7 +750,7 @@ class DropdownChoice(ValueSpec): # Convert values from choices to keys defval = "0" options = [] - for n, entry in enumerate(self._choices): + for n, entry in enumerate(self.choices()): options.append((str(n),) + entry[1:]) if entry[0] == value: defval = str(n) @@ -751,7 +760,7 @@ class DropdownChoice(ValueSpec): html.select(varprefix, options, defval) def value_to_text(self, value): - for entry in self._choices: + for entry in self.choices(): val, title = entry[:2] if value == val: if self._help_separator: @@ -761,18 +770,18 @@ class DropdownChoice(ValueSpec): def from_html_vars(self, varprefix): sel = html.var(varprefix) - for n, entry in enumerate(self._choices): + for n, entry in enumerate(self.choices()): val = entry[0] if sel == str(n): return val - return self._choices[0][0] # can only happen if user garbled URL + return self.choices()[0][0] # can only happen if user garbled URL def validate_datatype(self, value, varprefix): - for val, title in self._choices: + for val, title in self.choices(): if val == value: return raise MKUserError(varprefix, _("Invalid value %s, must be in %s") % - ", ".join([v for (v,t) in self._choices])) + ", ".join([v for (v,t) in self.choices()])) # Special conveniance variant for monitoring states

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0761

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ffd1a69958f188ef1ac78b0df7a37fa59b02c5d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffd1a69958f188… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 30 10:25:23 2012 +0200 Updated bug entries #0761 --- .bugs/761 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/761 b/.bugs/761 new file mode 100644 index 0000000..c3c2287 --- /dev/null +++ b/.bugs/761 @@ -0,0 +1,11 @@ +Title: ValueSpec ListOf breaks during user input error +Component: multisite +State: open +Date: 2012-05-30 10:23:56 +Targetversion: 1.2.0 +Class: bug + +When an element of a ListOf() raises a user validation +error then the total ListOf() seems to fall back to its +original value - for example I've added a value and then +changed its position to top and then saved.

12 years, 4 months

Check_MK Git: check_mk: WATO: allow custom pending log function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80a5a4e1f2bfa197fee39e0b51cd9950694b4d14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80a5a4e1f2bfa1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 30 12:05:37 2012 +0200 WATO: allow custom pending log function --- web/htdocs/wato.py | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 17b07fc..ef18a6d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5216,7 +5216,11 @@ def mode_globalvars(phase): msg = _("Changed Configuration variable %s to %s." % (varname, current_settings[varname] and "on" or "off")) save_configuration_settings(current_settings) - log_pending(need_restart and SYNCRESTART or SYNC, None, "edit-configvar", msg) + pending_func = g_configvar_domains[domain].get("pending") + if pending_func: + pending_func(msg) + else: + log_pending(need_restart and SYNCRESTART or SYNC, None, "edit-configvar", msg) if action == "_reset": return "globalvars", msg else: @@ -5302,7 +5306,12 @@ def mode_edit_configvar(phase): status = SYNCRESTART else: status = SYNC - log_pending(status, None, "edit-configvar", msg) + + pending_func = g_configvar_domains[domain].get("pending") + if pending_func: + pending_func(msg) + else: + log_pending(status, None, "edit-configvar", msg) return "globalvars" if varname in current_settings: @@ -5359,10 +5368,12 @@ g_configvar_domains = { }, } -def register_configvar_domain(domain, configdir): +def register_configvar_domain(domain, configdir, pending = None): g_configvar_domains[domain] = { "configdir" : configdir, } + if pending: + g_configvar_domains[domain]["pending"] = pending # Persistenz: Speicherung der Werte # - WATO speichert seine Variablen für main.mk in conf.d/wato/global.mk

12 years, 4 months

Check_MK Git: check_mk: ValueSpec ListOf: allow alternative totext

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5ed0573b44a68bb75bb08dc989fd99ae1048514e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ed0573b44a68b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 31 09:49:00 2012 +0200 ValueSpec ListOf: allow alternative totext --- web/htdocs/valuespec.py | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5ee565e..e4a117f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -273,7 +273,7 @@ class TextAscii(ValueSpec): self._none_is_empty = kwargs.get("none_is_empty", False) self._regex = kwargs.get("regex") self._regex_error = kwargs.get("regex_error", - _("Your input odes not match the required format.")) + _("Your input does not match the required format.")) if type(self._regex) == str: self._regex = re.compile(self._regex) @@ -315,10 +315,10 @@ class TextAscii(ValueSpec): if self._none_is_empty and value == "": raise MKUserError(varprefix, _("An empty value must be represented with None here.")) if not self._allow_empty and value.strip() == "": - raise MKUserError(varprefix, _("An empty value is not allowed here.")) + raise MKUserError(varprefix, self.title() + ": " + _("An empty value is not allowed here.")) if value and self._regex: if not self._regex.match(value): - raise MKUserError(varprefix, self._regex_error) + raise MKUserError(varprefix, self.title() + ": " + self._regex_error) class RegExp(TextAscii): def __init__(self, **kwargs): @@ -548,6 +548,7 @@ class ListOf(ValueSpec): self._rowlabel = kwargs.get("row_label") self._add_label = kwargs.get("add_label", _("Add new element")) self._movable = kwargs.get("movable", True) + self._totext = kwargs.get("totext") def del_button(self, vp, nr): js = "valuespec_listof_delete(this, '%s', '%s')" % (vp, nr) @@ -612,8 +613,14 @@ class ListOf(ValueSpec): return [] def value_to_text(self, value): - return ", ".join([ - self._valuespec.value_to_text(v) for v in value]) + if self._totext: + if "%d" in self._totext: + return self._totext % len(value) + else: + return self._totext + else: + return ", ".join([ + self._valuespec.value_to_text(v) for v in value]) def from_html_vars(self, varprefix): n = 1 @@ -1644,7 +1651,8 @@ class Dictionary(ValueSpec): self._optional_keys = False else: self._optional_keys = True - self._required_keys = kwargs.get("required_keys", []) + + self._required_keys = kwargs.get("required_keys", []) self._columns = kwargs.get("columns", 1) # possible: 1 or 2 self._render = kwargs.get("render", "normal") # also: "form" -> use forms.section() self._headers = kwargs.get("headers")

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012