[checkmk-commits] Created generic SiteChoice() valuespec

Module: check_mk Branch: master Commit: 83a69af70ce31a2d56fe5a855a4668b7ea01ddf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83a69af70ce31a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 12 08:54:08 2017 +0200 Created generic SiteChoice() valuespec Change-Id: Ib1ef26a8a10e3d1917ac4ec6449e6a67a6f4fb38 --- web/htdocs/valuespec.py | 18 ++++++++++++++++++ web/htdocs/watolib.py | 5 +---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b3397a1..91534c9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4529,6 +4529,24 @@ def ListOfCAs(**args): ) +class SiteChoice(DropdownChoice): + def __init__(self, **kwargs): + import config + kwargs.setdefault("title", _("Site")) + kwargs.setdefault("help", _("Specify the site of your choice")) + kwargs.setdefault("default_value", config.default_site()) + kwargs.setdefault("invalid_choice_error", _("The configured site is not known to this site.")) + + kwargs.update({ + "choices": config.site_choices, + "invalid_choice": "complain", + "invalid_choice_title": _("Unknown site (%s)"), + }) + + super(SiteChoice, self).__init__(**kwargs) + + + class TimeperiodSelection(ElementSelection): def __init__(self, **kwargs): ElementSelection.__init__(self, **kwargs) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index c498b0f..f6de125 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4176,13 +4176,10 @@ class SiteAttribute(ValueSpecAttribute): def __init__(self): # Default is is the local one, if one exists or # no one if there is no local site - ValueSpecAttribute.__init__(self, "site", DropdownChoice( + ValueSpecAttribute.__init__(self, "site", SiteChoice( title=_("Monitored on site"), help=_("Specify the site that should monitor this host."), default_value = default_site(), - choices = site_choices, - invalid_choice = "complain", - invalid_choice_title = _("Unknown site (%s)"), invalid_choice_error = _("The configured site is not known to this site. In case you " "are configuring in a distributed slave, this may be a host " "monitored by another site. If you want to modify this "