[checkmk-commits] Drodown choice: Show "no element message" when submitted without choice instead of "invalid value message"

Module: check_mk Branch: master Commit: fb217dfcd4e36e50adeda1816ad573d889649041 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb217dfcd4e36e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 17:50:44 2018 +0200 Drodown choice: Show "no element message" when submitted without choice instead of "invalid value message" Change-Id: I064f42fe28a4c9724ebfba092066f59dc85c7f59 --- cmk/gui/valuespec.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 91924b2..4c550c0 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1675,6 +1675,8 @@ class DropdownChoice(ValueSpec): if self._invalid_choice == "replace": return self.default_value() # garbled URL or len(choices) == 0 + elif not choices: + raise MKUserError(varprefix, self._empty_text) else: raise MKUserError(varprefix, self._invalid_choice_error) @@ -1704,7 +1706,7 @@ class DropdownChoice(ValueSpec): if value != None: raise MKUserError(varprefix, self._invalid_choice_error) else: - raise MKUserError(varprefix, _("There is no element available to choose from.")) + raise MKUserError(varprefix, self._empty_text) ValueSpec.custom_validate(self, value, varprefix)