[checkmk-commits] Check_MK Git: check_mk: #1957 FIX Fixed usage of default values in valuespec alternative selection

Module: check_mk Branch: master Commit: b54a1e993d625e3179ddab1e9a4d1678aab76349 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54a1e993d625e… Author: Sven Rueß &lt;sr(a)mathias-kettner.de&gt; Date: Fri Apr 17 10:06:43 2015 +0200 #1957 FIX Fixed usage of default values in valuespec alternative selection No default values were used in valuespec alternative selection. Now all default values are shown in subelements of alternative selection. --- .werks/1957 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/1957 b/.werks/1957 new file mode 100644 index 0000000..49c70f8 --- /dev/null +++ b/.werks/1957 @@ -0,0 +1,11 @@ +Title: Fixed usage of default values in valuespec alternative selection +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429257630 + +No default values were used in valuespec alternative selection. +Now all default values are shown in subelements of alternative selection. diff --git a/ChangeLog b/ChangeLog index b4ad364..e7b2e2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -397,6 +397,7 @@ * 2142 FIX: Fix non-working option for disabling column headers in grouped boxed views... * 2168 FIX: Fixed automation actions with transid=-1 when using basic authentication * 2177 FIX: Host/Service statistics dashlets honor the site filter correctly now + * 1957 FIX: Fixed usage of default values in valuespec alternative selection... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3054f8f..c40f3bf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2530,9 +2530,6 @@ class Alternative(ValueSpec): vs.render_input(varprefix + "_%d" % nr, cur_val) html.write("</span>") - - - def render_input_radio(self, varprefix, value): mvs = self.matching_alternative(value) for nr, vs in enumerate(self._elements): @@ -2564,6 +2561,9 @@ class Alternative(ValueSpec): def canonical_value(self): return self._elements[0].canonical_value() + def default_value(self): + return self._elements[0].default_value() + def value_to_text(self, value): vs = self.matching_alternative(value) if vs: